summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
diff options
context:
space:
mode:
authorAnatoly Spektor <aspektor@redhat.com>2012-07-06 15:22:07 -0400
committerSilenio Quarti <silenio_quarti@ca.ibm.com>2012-08-01 10:19:25 -0400
commit0d23f871e57d5ad4ac4223f8da9d549bb534627e (patch)
tree6b0cc2ee1dec16e06e10492b272f2482d1de742b /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
parentb2f2631812bb255ec81879bc4ce8063e64a87354 (diff)
downloadeclipse.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/Combo.java')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
index 5adc42c51e..f521a7a0a8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
@@ -366,7 +366,11 @@ void createHandle (int index) {
state |= HANDLE | MENU;
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
- OS.gtk_fixed_set_has_window (fixedHandle, true);
+ 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*/ oldList = OS.gtk_window_list_toplevels ();
if ((style & SWT.READ_ONLY) != 0) {
handle = OS.gtk_combo_box_new_text ();