diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2012-10-03 00:42:22 +0300 |
|---|---|---|
| committer | Alexander Kurtakov <akurtako@redhat.com> | 2012-10-03 00:42:22 +0300 |
| commit | 26da329d593c3d3e2d59fbd6c7fdc55bac80984c (patch) | |
| tree | 94abbbe4d54f9059416dd455dbd641504a118abc /bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org | |
| parent | 09f1692137fcd35dbae7ea8049913ec763ba69df (diff) | |
| download | eclipse.platform.swt-26da329d593c3d3e2d59fbd6c7fdc55bac80984c.tar.gz eclipse.platform.swt-26da329d593c3d3e2d59fbd6c7fdc55bac80984c.tar.xz eclipse.platform.swt-26da329d593c3d3e2d59fbd6c7fdc55bac80984c.zip | |
Make use of gdk_x11_window_get_xid instead of gdk_x11_drawable_get_xid.
The former is a replacement for the later in GTK3.
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java index 83145d88e1..5577ec928a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java @@ -203,7 +203,9 @@ public static Frame new_Frame (final Composite parent) { long /*int*/ awtHandle = getAWTHandle(window); if (awtHandle == 0) return; long /*int*/ xWindow; - if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){ + if (OS.GTK_VERSION >= OS.VERSION(3, 0, 0)) { + xWindow = OS.gdk_x11_window_get_xid (OS.gtk_widget_get_window (shell.handle)); + } else if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){ xWindow = OS.gdk_x11_drawable_get_xid(OS.gtk_widget_get_window(OS.gtk_widget_get_toplevel(shell.handle))); } else { xWindow = OS.gdk_x11_drawable_get_xid(OS.GTK_WIDGET_WINDOW(OS.gtk_widget_get_toplevel(shell.handle))); |