diff options
| author | Alexander Kurtakov | 2012-02-28 14:43:32 +0000 |
|---|---|---|
| committer | Carolyn MacLeod | 2012-03-06 21:46:51 +0000 |
| commit | d064821ef5de8ff4063894d709d8221c6beb983e (patch) | |
| tree | 974daa474c318caf4685727cc787b69e86d18b6e /bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library | |
| parent | 0d33c8649e8a0bd7ef78f3f1bceecb64e6067f50 (diff) | |
| download | eclipse.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 PI/gtk/library')
3 files changed, 14 insertions, 14 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 01c8304d17..86bcbd877c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -1299,18 +1299,6 @@ fail: } #endif -#ifndef NO__1GDK_1DISPLAY -JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1DISPLAY) - (JNIEnv *env, jclass that) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1GDK_1DISPLAY_FUNC); - rc = (jintLong)GDK_DISPLAY(); - OS_NATIVE_EXIT(env, that, _1GDK_1DISPLAY_FUNC); - return rc; -} -#endif - #ifndef NO__1GDK_1PIXMAP_1XID JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1PIXMAP_1XID) (JNIEnv *env, jclass that, jintLong arg0) @@ -7403,6 +7391,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1colormap_1get_1xcolormap) } #endif +#ifndef NO__1gdk_1x11_1display_1get_1xdisplay +JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1display_1get_1xdisplay) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jintLong rc = 0; + OS_NATIVE_ENTER(env, that, _1gdk_1x11_1display_1get_1xdisplay_FUNC); + rc = (jintLong)gdk_x11_display_get_xdisplay((GdkDisplay *)arg0); + OS_NATIVE_EXIT(env, that, _1gdk_1x11_1display_1get_1xdisplay_FUNC); + return rc; +} +#endif + #ifndef NO__1gdk_1x11_1drawable_1get_1xdisplay JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xdisplay) (JNIEnv *env, jclass that, jintLong arg0) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index 08d483c18c..a4566ed671 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -135,7 +135,6 @@ char * OS_nativeFunctionNames[] = { "X_1EVENT_1WINDOW", "_1Call", "_1FcConfigAppFontAddFile", - "_1GDK_1DISPLAY", "_1GDK_1PIXMAP_1XID", "_1GDK_1ROOT_1PARENT", "_1GDK_1TYPE_1COLOR", @@ -606,6 +605,7 @@ char * OS_nativeFunctionNames[] = { "_1gdk_1window_1thaw_1updates", "_1gdk_1x11_1atom_1to_1xatom", "_1gdk_1x11_1colormap_1get_1xcolormap", + "_1gdk_1x11_1display_1get_1xdisplay", "_1gdk_1x11_1drawable_1get_1xdisplay", "_1gdk_1x11_1drawable_1get_1xid", "_1gdk_1x11_1screen_1get_1window_1manager_1name", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index 5da325ed38..2984b14a2e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -143,7 +143,6 @@ typedef enum { X_1EVENT_1WINDOW_FUNC, _1Call_FUNC, _1FcConfigAppFontAddFile_FUNC, - _1GDK_1DISPLAY_FUNC, _1GDK_1PIXMAP_1XID_FUNC, _1GDK_1ROOT_1PARENT_FUNC, _1GDK_1TYPE_1COLOR_FUNC, @@ -614,6 +613,7 @@ typedef enum { _1gdk_1window_1thaw_1updates_FUNC, _1gdk_1x11_1atom_1to_1xatom_FUNC, _1gdk_1x11_1colormap_1get_1xcolormap_FUNC, + _1gdk_1x11_1display_1get_1xdisplay_FUNC, _1gdk_1x11_1drawable_1get_1xdisplay_FUNC, _1gdk_1x11_1drawable_1get_1xid_FUNC, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC, |