From e3b156724d528ef4e6591e0a0b37246111e83b29 Mon Sep 17 00:00:00 2001 From: Anatoly Spektor Date: Fri, 19 Jul 2013 10:23:29 -0400 Subject: Bug 413331 - Remove unused 2.10 version guard from Display widget Signed-off-by: Anatoly Spektor --- .../gtk/org/eclipse/swt/widgets/Display.java | 24 ++++++++++------------ 1 file 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 4bddd5ba20..cf8f092123 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; -- cgit