Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2015-03-13 12:04:57 +0000
committerAlexander Kurtakov2015-03-13 12:04:57 +0000
commit8de1ac9db91bb43b6bd0099ed55c1ebbf15558ad (patch)
treeb7fe79ae9b381737e21b004dc484368de0b39591 /bundles/org.eclipse.swt/Eclipse SWT AWT
parentb9f7831e7bdf04474ffdab87efb437511a67f97b (diff)
downloadeclipse.platform.swt-8de1ac9db91bb43b6bd0099ed55c1ebbf15558ad.tar.gz
eclipse.platform.swt-8de1ac9db91bb43b6bd0099ed55c1ebbf15558ad.tar.xz
eclipse.platform.swt-8de1ac9db91bb43b6bd0099ed55c1ebbf15558ad.zip
Bug 462064 - Remove GTK_WIDGET_* macros
Removed the following - GTK_WIDGET_HAS_DEFAULT, GTK_WIDGET_HAS_FOCUS, GTK_WIDGET_SENSITIVE, GTK_WIDGET_VISIBLE, GTK_WIDGET_WINDOW. Fixes no-op macros (on GTK 3.x) GTK_WIDGET_WINDOW being called. Change-Id: Ia37430ff8177e30eefc8947e24cdb55ccc2ad460 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT AWT')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java4
1 files changed, 1 insertions, 3 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 e5b403378a..0a47aefbc5 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
@@ -205,10 +205,8 @@ public static Frame new_Frame (final Composite parent) {
long /*int*/ xWindow;
if (OS.GTK3) {
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)));
+ xWindow = OS.gdk_x11_drawable_get_xid(OS.gtk_widget_get_window(OS.gtk_widget_get_toplevel(shell.handle)));
}
OS.XSetTransientForHint(OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()), awtHandle, xWindow);
}

Back to the top