diff options
author | Alexander Kurtakov | 2012-01-20 03:18:08 -0500 |
---|---|---|
committer | Silenio Quarti | 2012-01-20 12:34:48 -0500 |
commit | 68fd263cea74f91e7fe4706e0ba952e21764235f (patch) | |
tree | 4dfabc6d87a0df0792c28d61f50485d29da8a4e7 | |
parent | 8ec41706f7dfc4f4b8a5be57c3df193eec4545a2 (diff) | |
download | eclipse.platform.swt-68fd263cea74f91e7fe4706e0ba952e21764235f.zip eclipse.platform.swt-68fd263cea74f91e7fe4706e0ba952e21764235f.tar.gz eclipse.platform.swt-68fd263cea74f91e7fe4706e0ba952e21764235f.tar.xz |
Get rid of gdk_rgb_init.
This function is deprecated even in gtk 2.0 and is a no-op practically
for the whole gtk 2 life. Also it's dropped in gtk 3.0 and makes no
sense to keep it in.
5 files changed, 2 insertions, 24 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 714d5b5..978787c 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 @@ -6523,16 +6523,6 @@ fail: } #endif -#ifndef NO__1gdk_1rgb_1init -JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1rgb_1init) - (JNIEnv *env, jclass that) -{ - OS_NATIVE_ENTER(env, that, _1gdk_1rgb_1init_FUNC); - gdk_rgb_init(); - OS_NATIVE_EXIT(env, that, _1gdk_1rgb_1init_FUNC); -} -#endif - #ifndef NO__1gdk_1screen_1get_1default JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1screen_1get_1default) (JNIEnv *env, jclass that) 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 391ebf6..db2f4b5 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 = 1383; -int OS_nativeFunctionCallCount[1383]; +int OS_nativeFunctionCount = 1382; +int OS_nativeFunctionCallCount[1382]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -541,7 +541,6 @@ char * OS_nativeFunctionNames[] = { "_1gdk_1region_1subtract", "_1gdk_1region_1union", "_1gdk_1region_1union_1with_1rect", - "_1gdk_1rgb_1init", "_1gdk_1screen_1get_1default", "_1gdk_1screen_1get_1monitor_1at_1point", "_1gdk_1screen_1get_1monitor_1at_1window", 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 7e6d1d4..e729c66 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 @@ -549,7 +549,6 @@ typedef enum { _1gdk_1region_1subtract_FUNC, _1gdk_1region_1union_FUNC, _1gdk_1region_1union_1with_1rect_FUNC, - _1gdk_1rgb_1init_FUNC, _1gdk_1screen_1get_1default_FUNC, _1gdk_1screen_1get_1monitor_1at_1point_FUNC, _1gdk_1screen_1get_1monitor_1at_1window_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 c173280..2988aa5 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 @@ -5054,15 +5054,6 @@ public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRect lock.unlock(); } } -public static final native void _gdk_rgb_init(); -public static final void gdk_rgb_init() { - lock.lock(); - try { - _gdk_rgb_init(); - } finally { - lock.unlock(); - } -} /** @method flags=dynamic */ public static final native int /*long*/ _gdk_screen_get_default(); public static final int /*long*/ gdk_screen_get_default() { 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 3aadcab..a38b242 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 @@ -988,7 +988,6 @@ void createDisplay (DeviceData data) { } OS.gtk_widget_set_default_direction (OS.GTK_TEXT_DIR_LTR); - OS.gdk_rgb_init (); byte [] buffer = Converter.wcsToMbcs (null, APP_NAME, true); OS.g_set_prgname (buffer); OS.gdk_set_program_class (buffer); |