Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-02-28 14:43:32 +0000
committerCarolyn MacLeod2012-03-06 21:46:51 +0000
commitd064821ef5de8ff4063894d709d8221c6beb983e (patch)
tree974daa474c318caf4685727cc787b69e86d18b6e /bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
parent0d33c8649e8a0bd7ef78f3f1bceecb64e6067f50 (diff)
downloadeclipse.platform.swt-d064821ef5de8ff4063894d709d8221c6beb983e.tar.gz
eclipse.platform.swt-d064821ef5de8ff4063894d709d8221c6beb983e.tar.xz
eclipse.platform.swt-d064821ef5de8ff4063894d709d8221c6beb983e.zip
Replace usage of GDK_DISPLAY with gdk_x11_display_get_xdisplay.
GDK_DISPLAY macro is deprecated and removed in gtk3. The function used is in gtk since 2.2.
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
index 1c67940b0e..3b734dd574 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
@@ -74,7 +74,7 @@ static int getDesktop(final Display display) {
int desktop = DESKTOP_UNKNOWN;
/* Get the list of properties on the root window. */
- int /*long*/ xDisplay = OS.GDK_DISPLAY();
+ int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
int /*long*/ rootWindow = OS.XDefaultRootWindow(xDisplay);
int[] numProp = new int[1];
int /*long*/ propList = OS.XListProperties(xDisplay, rootWindow, numProp);
@@ -307,7 +307,7 @@ static boolean cde_init(Display display) {
/* Use the character encoding for the default locale */
CDE.XtToolkitInitialize();
int /*long*/ xtContext = CDE.XtCreateApplicationContext ();
- int /*long*/ xDisplay = OS.GDK_DISPLAY();
+ int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
byte[] appName = Converter.wcsToMbcs(null, "CDE", true);
byte[] appClass = Converter.wcsToMbcs(null, "CDE", true);
int /*long*/ [] argc = new int /*long*/ [] {0};

Back to the top