diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2012-10-23 13:25:29 +0300 |
|---|---|---|
| committer | Alexander Kurtakov <akurtako@redhat.com> | 2012-10-23 13:25:29 +0300 |
| commit | 41646b278ce999adc80afe17263f6f9483b90045 (patch) | |
| tree | c8fb070a1f9dd9489ee1e79b278e9f9f579b682e /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java | |
| parent | e91638284e681c28532a38f51bdfcbbeea2d1f41 (diff) | |
| download | eclipse.platform.swt-41646b278ce999adc80afe17263f6f9483b90045.tar.gz eclipse.platform.swt-41646b278ce999adc80afe17263f6f9483b90045.tar.xz eclipse.platform.swt-41646b278ce999adc80afe17263f6f9483b90045.zip | |
Use gdk_x11_get_default_xdisplay unconditionally.
It's available in all supported GTK version and for some reason if its
dynamic it doesn't work on GTK3.
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java index 9eda2d4d02..35c8b5efb0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java @@ -913,13 +913,7 @@ void createDisplay (DeviceData data) { if (!OS.gtk_init_check (new long /*int*/ [] {0}, null)) { SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]"); //$NON-NLS-1$ } - if (OS.GDK_WINDOWING_X11 ()) { - if (OS.GTK_VERSION >= OS.VERSION(3, 0, 0)) { - xDisplay = OS.gdk_x11_get_default_xdisplay(); - } else { - xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); - } - } + if (OS.GDK_WINDOWING_X11 ()) xDisplay = OS.gdk_x11_get_default_xdisplay(); long /*int*/ ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO); if (ptr != 0) { int length = OS.strlen (ptr); |