diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2012-11-06 16:22:30 +0200 |
|---|---|---|
| committer | Alexander Kurtakov <akurtako@redhat.com> | 2012-11-06 16:22:30 +0200 |
| commit | 178cb4e2bfde0fd9413f9dbcf7daef2ded96190a (patch) | |
| tree | 10f6a0a74b2d4241acf3d3e990b5ea172e248f9f | |
| parent | dcf63a1ba6c346121e757780d77e92fb9c9886c3 (diff) | |
| download | eclipse.platform.swt-178cb4e2bfde0fd9413f9dbcf7daef2ded96190a.tar.gz eclipse.platform.swt-178cb4e2bfde0fd9413f9dbcf7daef2ded96190a.tar.xz eclipse.platform.swt-178cb4e2bfde0fd9413f9dbcf7daef2ded96190a.zip | |
Drop pre Gtk 2.6 conditionals.
2 files changed, 2 insertions, 8 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ButtonDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ButtonDrawData.java index 510557b8fb..b6e4eb1965 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ButtonDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ButtonDrawData.java @@ -179,10 +179,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) { if ((state & DrawData.FOCUSED) != 0) { int child_displacement_y = theme.getWidgetProperty(buttonHandle, "child-displacement-y"); int child_displacement_x = theme.getWidgetProperty(buttonHandle, "child-displacement-x"); - int displace_focus = 0; - if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) { - displace_focus = theme.getWidgetProperty(buttonHandle, "displace-focus"); - } + int displace_focus = theme.getWidgetProperty(buttonHandle, "displace-focus"); int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus"); if (interior_focus != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolItemDrawData.java index c86aa87c92..84af6595f1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolItemDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolItemDrawData.java @@ -134,10 +134,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) { if ((state & DrawData.FOCUSED) != 0) { int child_displacement_y = theme.getWidgetProperty(buttonHandle, "child-displacement-y"); int child_displacement_x = theme.getWidgetProperty(buttonHandle, "child-displacement-x"); - int displace_focus = 0; - if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) { - displace_focus = theme.getWidgetProperty(buttonHandle, "displace-focus"); - } + int displace_focus = theme.getWidgetProperty(buttonHandle, "displace-focus"); if (interior_focus != 0) { int ythickness = OS.gtk_style_get_ythickness(gtkStyle); |