aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Spektor2013-07-19 10:23:29 (EDT)
committerArun Thondapu2013-07-22 03:43:41 (EDT)
commitb7e80235c7aba87bf303961731c884eb6cbe0795 (patch)
tree0b3a66d8f5dcba3470db4868bc499f85b975698e
parent03bf77d16dd9eb63f3855573d83108eba52b0a98 (diff)
downloadeclipse.platform.swt-b7e80235c7aba87bf303961731c884eb6cbe0795.zip
eclipse.platform.swt-b7e80235c7aba87bf303961731c884eb6cbe0795.tar.gz
eclipse.platform.swt-b7e80235c7aba87bf303961731c884eb6cbe0795.tar.bz2
Bug 413331 - Remove unused 2.10 version guard from Display widget
Signed-off-by: Anatoly Spektor <aspektor@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java24
1 files changed, 11 insertions, 13 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index 4bddd5b..cf8f092 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -1529,19 +1529,17 @@ public Control getCursorControl () {
static GtkBorder getEntryInnerBorder (long /*int*/ handle) {
GtkBorder gtkBorder = new GtkBorder();
- if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
- long /*int*/ border = OS.gtk_entry_get_inner_border (handle);
- if (border != 0) {
- OS.memmove (gtkBorder, border, GtkBorder.sizeof);
- return gtkBorder;
- }
- long /*int*/ [] borderPtr = new long /*int*/ [1];
- OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
- if (borderPtr[0] != 0) {
- OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
- OS.gtk_border_free(borderPtr[0]);
- return gtkBorder;
- }
+ long /*int*/ border = OS.gtk_entry_get_inner_border (handle);
+ if (border != 0) {
+ OS.memmove (gtkBorder, border, GtkBorder.sizeof);
+ return gtkBorder;
+ }
+ long /*int*/ [] borderPtr = new long /*int*/ [1];
+ OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
+ if (borderPtr[0] != 0) {
+ OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
+ OS.gtk_border_free(borderPtr[0]);
+ return gtkBorder;
}
gtkBorder.left = INNER_BORDER;
gtkBorder.top = INNER_BORDER;