diff options
author | Alexander Kurtakov <akurtako@redhat.com> | 2012-04-11 14:07:04 +0300 |
---|---|---|
committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-06-26 15:45:20 -0400 |
commit | 5abc2ee4c9c2df2a76af3d8451dc1e3d68c328c4 (patch) | |
tree | 93d3d60cd44e185df210b6aacb282991c4a742d8 | |
parent | f784e6c379b62f88db4f664f4765ca3b191c76be (diff) | |
download | eclipse.platform.swt-5abc2ee4c9c2df2a76af3d8451dc1e3d68c328c4.tar.gz eclipse.platform.swt-5abc2ee4c9c2df2a76af3d8451dc1e3d68c328c4.tar.xz eclipse.platform.swt-5abc2ee4c9c2df2a76af3d8451dc1e3d68c328c4.zip |
Remove unused gdk_ functions bindings.
Conflicts:
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
4 files changed, 2 insertions, 49 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 0c0dbcf6e6..7aeba0d828 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 @@ -6377,18 +6377,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale_1simple) } #endif -#ifndef NO__1gdk_1pixmap_1foreign_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixmap_1foreign_1new) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1foreign_1new_FUNC); - rc = (jintLong)gdk_pixmap_foreign_new(arg0); - OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1foreign_1new_FUNC); - return rc; -} -#endif - #ifndef NO__1gdk_1pixmap_1new JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixmap_1new) (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3) @@ -7524,18 +7512,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom) } #endif -#ifndef NO__1gdk_1x11_1colormap_1get_1xcolormap -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1colormap_1get_1xcolormap) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gdk_1x11_1colormap_1get_1xcolormap_FUNC); - rc = (jintLong)gdk_x11_colormap_get_xcolormap((GdkColormap *)arg0); - OS_NATIVE_EXIT(env, that, _1gdk_1x11_1colormap_1get_1xcolormap_FUNC); - return rc; -} -#endif - #ifndef NO__1gdk_1x11_1display_1get_1xdisplay JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1display_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 7f377aea17..c4925aada9 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 @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1402; -int OS_nativeFunctionCallCount[1402]; +int OS_nativeFunctionCount = 1400; +int OS_nativeFunctionCallCount[1400]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -517,7 +517,6 @@ char * OS_nativeFunctionNames[] = { "_1gdk_1pixbuf_1save_1to_1bufferv", "_1gdk_1pixbuf_1scale", "_1gdk_1pixbuf_1scale_1simple", - "_1gdk_1pixmap_1foreign_1new", "_1gdk_1pixmap_1new", "_1gdk_1pointer_1grab", "_1gdk_1pointer_1is_1grabbed", @@ -603,7 +602,6 @@ char * OS_nativeFunctionNames[] = { "_1gdk_1window_1show_1unraised", "_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", 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 b947253983..fbcff1ec73 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 @@ -525,7 +525,6 @@ typedef enum { _1gdk_1pixbuf_1save_1to_1bufferv_FUNC, _1gdk_1pixbuf_1scale_FUNC, _1gdk_1pixbuf_1scale_1simple_FUNC, - _1gdk_1pixmap_1foreign_1new_FUNC, _1gdk_1pixmap_1new_FUNC, _1gdk_1pointer_1grab_FUNC, _1gdk_1pointer_1is_1grabbed_FUNC, @@ -611,7 +610,6 @@ typedef enum { _1gdk_1window_1show_1unraised_FUNC, _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, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index e967446d72..455e3c05f4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -1138,16 +1138,6 @@ public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) { lock.unlock(); } } -/** @param colormap cast=(GdkColormap *) */ -public static final native int /*long*/ _gdk_x11_colormap_get_xcolormap(int /*long*/ colormap); -public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ colormap) { - lock.lock(); - try { - return _gdk_x11_colormap_get_xcolormap(colormap); - } finally { - lock.unlock(); - } -} /** @param gdkdisplay cast=(GdkDisplay *) */ public static final native int /*long*/ _gdk_x11_display_get_xdisplay(int /*long*/ gdkdisplay); public static final int /*long*/ gdk_x11_display_get_xdisplay (int /*long*/ gdkdisplay) { @@ -1228,15 +1218,6 @@ public static final int /*long*/ gdk_x11_window_lookup_for_display(int /*long*/ lock.unlock(); } } -public static final native int /*long*/ _gdk_pixmap_foreign_new(int /*long*/ anid); -public static final int /*long*/ gdk_pixmap_foreign_new(int /*long*/ anid) { - lock.lock(); - try { - return _gdk_pixmap_foreign_new(anid); - } finally { - lock.unlock(); - } -} /** * @method flags=dynamic */ |