diff options
| author | Anatoly Spektor <aspektor@redhat.com> | 2012-07-06 15:22:07 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-01 10:19:25 -0400 |
| commit | 0d23f871e57d5ad4ac4223f8da9d549bb534627e (patch) | |
| tree | 6b0cc2ee1dec16e06e10492b272f2482d1de742b /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java | |
| parent | b2f2631812bb255ec81879bc4ce8063e64a87354 (diff) | |
| download | eclipse.platform.swt-0d23f871e57d5ad4ac4223f8da9d549bb534627e.tar.gz eclipse.platform.swt-0d23f871e57d5ad4ac4223f8da9d549bb534627e.tar.xz eclipse.platform.swt-0d23f871e57d5ad4ac4223f8da9d549bb534627e.zip | |
Use gtk_widget_set_has_window() instead of gtk_fixed_set_has_window()
Conflicts:
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java index 81445e9bd1..895e41b9e7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java @@ -262,8 +262,12 @@ void createHandle (int index, boolean fixed, boolean scrolled) { if (fixed) { fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0); if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES); + if (OS.GTK_VERSION >= OS.VERSION(2, 18, 0)) { + OS.gtk_widget_set_has_window(fixedHandle, true); + }else{ OS.gtk_fixed_set_has_window (fixedHandle, true); } + } int /*long*/ vadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10); if (vadj == 0) error (SWT.ERROR_NO_HANDLES); int /*long*/ hadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10); @@ -273,7 +277,11 @@ void createHandle (int index, boolean fixed, boolean scrolled) { } handle = OS.g_object_new (display.gtk_fixed_get_type (), 0); if (handle == 0) error (SWT.ERROR_NO_HANDLES); - OS.gtk_fixed_set_has_window (handle, true); + if (OS.GTK_VERSION >= OS.VERSION(2, 18, 0)) { + OS.gtk_widget_set_has_window(handle, true); + }else{ + OS.gtk_fixed_set_has_window (handle, true); + } OS.GTK_WIDGET_SET_FLAGS(handle, OS.GTK_CAN_FOCUS); if ((style & SWT.EMBEDDED) == 0) { if ((state & CANVAS) != 0) { |