diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2012-02-28 16:43:32 +0200 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-02-28 14:34:17 -0500 |
| commit | 1d8346aea092907f235391a00d0ca08a5840c300 (patch) | |
| tree | 26b89d92a8fd544860818669e1a8f0d71d7897cd /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java | |
| parent | c4cf222e3fe3cc10edd722f83c8c46fcaaa0e328 (diff) | |
| download | eclipse.platform.swt-1d8346aea092907f235391a00d0ca08a5840c300.tar.gz eclipse.platform.swt-1d8346aea092907f235391a00d0ca08a5840c300.tar.xz eclipse.platform.swt-1d8346aea092907f235391a00d0ca08a5840c300.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/gtk/org/eclipse/swt/graphics/GC.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java index 23f6ec879b..03178173e3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java @@ -461,7 +461,7 @@ public void copyArea(Image image, int x, int y) { int[] w = new int[1], h = new int[1]; OS.gdk_drawable_get_size(data.drawable, w, h); int width = w[0], height = h[0]; - int /*long*/ xDisplay = OS.GDK_DISPLAY(); + int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); int /*long*/ xDrawable = OS.gdk_x11_drawable_get_xid(data.drawable); int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); int /*long*/ srcSurface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height); @@ -1122,7 +1122,7 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH translateX = -x[0]; translateY = -y[0]; } - int /*long*/ xDisplay = OS.GDK_DISPLAY(); + int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); int /*long*/ maskPict = 0; if (maskPixmap != 0) { int attribCount = 0; @@ -2925,7 +2925,7 @@ void initCairo() { int /*long*/ cairo = data.cairo; if (cairo != 0) return; if (OS.GTK_VERSION < OS.VERSION(2, 17, 0)) { - int /*long*/ xDisplay = OS.GDK_DISPLAY(); + int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()); int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); int /*long*/ xDrawable = 0; int translateX = 0, translateY = 0; |