From a215b82e21c4662f93a9c3b2b1fa9b09bb89fa3f Mon Sep 17 00:00:00 2001 From: Anatoly Spektor Date: Thu, 16 Aug 2012 10:43:52 -0400 Subject: Omit use of GTK_RANGE_HAS_STEPPER_A,B,C,D constants for newer GTK+ Conflicts: bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c --- .../Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java') diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java index fecf64eba9..f738c23278 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java @@ -396,10 +396,15 @@ public Rectangle getThumbBounds () { public Rectangle getThumbTrackBounds () { checkWidget(); int x = 0, y = 0, width, height; - boolean hasA = OS.GTK_RANGE_HAS_STEPPER_A (handle); - boolean hasB = OS.GTK_RANGE_HAS_STEPPER_B (handle); - boolean hasC = OS.GTK_RANGE_HAS_STEPPER_C (handle); - boolean hasD = OS.GTK_RANGE_HAS_STEPPER_D (handle); + int[] has_stepper = new int[1]; + OS.gtk_widget_style_get (handle, OS.has_backward_stepper, has_stepper, 0); + boolean hasA = has_stepper[0] != 0; + OS.gtk_widget_style_get (handle, OS.has_secondary_backward_stepper, has_stepper, 0); + boolean hasB = has_stepper[0] != 0; + OS.gtk_widget_style_get (handle, OS.has_forward_stepper, has_stepper, 0); + boolean hasC = has_stepper[0] != 0; + OS.gtk_widget_style_get (handle, OS.has_secondary_forward_stepper, has_stepper, 0); + boolean hasD = has_stepper[0] != 0; GtkAllocation allocation = new GtkAllocation (); int stepperSize = 0; if ((style & SWT.VERTICAL) != 0) { -- cgit