From ed17dbb1dbd2fa2834dc10f88390137a8599a022 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 11 Apr 2012 15:22:58 +0300 Subject: Remove unused gtk_* functions (part 1). Conflicts: bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c --- .../Eclipse SWT PI/gtk/library/os.c | 195 --------------------- .../Eclipse SWT PI/gtk/library/os_stats.c | 18 +- .../Eclipse SWT PI/gtk/library/os_stats.h | 14 -- .../gtk/org/eclipse/swt/internal/gtk/OS.java | 165 ----------------- 4 files changed, 2 insertions(+), 390 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 27ce223de8..9d84a78787 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 @@ -7221,18 +7221,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1accel_1group_1new) } #endif -#ifndef NO__1gtk_1accel_1groups_1activate -JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1accel_1groups_1activate) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) -{ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1accel_1groups_1activate_FUNC); - rc = (jboolean)gtk_accel_groups_activate((GObject *)arg0, (guint)arg1, (GdkModifierType)arg2); - OS_NATIVE_EXIT(env, that, _1gtk_1accel_1groups_1activate_FUNC); - return rc; -} -#endif - #ifndef NO__1gtk_1accel_1label_1set_1accel_1widget JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1accel_1label_1set_1accel_1widget) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) @@ -7782,18 +7770,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1can_1store) } #endif -#ifndef NO__1gtk_1clipboard_1set_1with_1data -JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1with_1data) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5) -{ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1with_1data_FUNC); - rc = (jboolean)gtk_clipboard_set_with_data((GtkClipboard *)arg0, (const GtkTargetEntry *)arg1, (guint)arg2, (GtkClipboardGetFunc)arg3, (GtkClipboardClearFunc)arg4, (GObject *)arg5); - OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1set_1with_1data_FUNC); - return rc; -} -#endif - #ifndef NO__1gtk_1clipboard_1set_1with_1owner JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1with_1owner) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5) @@ -7866,23 +7842,6 @@ fail: } #endif -#ifndef NO__1gtk_1color_1selection_1palette_1from_1string -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1palette_1from_1string) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintArray arg2) -{ - jbyte *lparg0=NULL; - jint *lparg2=NULL; - OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1palette_1from_1string_FUNC); - if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - gtk_color_selection_palette_from_string((const gchar *)lparg0, (GdkColor **)arg1, (gint *)lparg2); -fail: - if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); - if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); - OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1palette_1from_1string_FUNC); -} -#endif - #ifndef NO__1gtk_1color_1selection_1palette_1to_1string JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1color_1selection_1palette_1to_1string) (JNIEnv *env, jclass that, jintLong arg0, jint arg1) @@ -8298,18 +8257,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1set_1icon_1pixbuf) } #endif -#ifndef NO__1gtk_1drawing_1area_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drawing_1area_1new) - (JNIEnv *env, jclass that) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1drawing_1area_1new_FUNC); - rc = (jintLong)gtk_drawing_area_new(); - OS_NATIVE_EXIT(env, that, _1gtk_1drawing_1area_1new_FUNC); - return rc; -} -#endif - #ifndef NO__1gtk_1editable_1copy_1clipboard JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1copy_1clipboard) (JNIEnv *env, jclass that, jintLong arg0) @@ -8350,18 +8297,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1text) } #endif -#ifndef NO__1gtk_1editable_1get_1chars -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1editable_1get_1chars) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1chars_FUNC); - rc = (jintLong)gtk_editable_get_chars((GtkEditable *)arg0, (gint)arg1, (gint)arg2); - OS_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1chars_FUNC); - return rc; -} -#endif - #ifndef NO__1gtk_1editable_1get_1editable JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1editable) (JNIEnv *env, jclass that, jintLong arg0) @@ -8571,16 +8506,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1new) } #endif -#ifndef NO__1gtk_1entry_1set_1activates_1default -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1activates_1default) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) -{ - OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1activates_1default_FUNC); - gtk_entry_set_activates_default((GtkEntry *)arg0, (gboolean)arg1); - OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1activates_1default_FUNC); -} -#endif - #ifndef NO__1gtk_1entry_1set_1alignment JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1alignment) (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) @@ -8731,18 +8656,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1enumerate_1printers) } #endif -#ifndef NO__1gtk_1events_1pending -JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1events_1pending) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1events_1pending_FUNC); - rc = (jint)gtk_events_pending(); - OS_NATIVE_EXIT(env, that, _1gtk_1events_1pending_FUNC); - return rc; -} -#endif - #ifndef NO__1gtk_1expander_1get_1expanded JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded) (JNIEnv *env, jclass that, jintLong arg0) @@ -8763,26 +8676,6 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded) } #endif -#ifndef NO__1gtk_1expander_1get_1label_1widget -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1label_1widget_FUNC); -/* - rc = (jintLong)gtk_expander_get_label_widget(arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_expander_get_label_widget) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); - } - } - OS_NATIVE_EXIT(env, that, _1gtk_1expander_1get_1label_1widget_FUNC); - return rc; -} -#endif - #ifndef NO__1gtk_1expander_1new JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1new) (JNIEnv *env, jclass that, jbyteArray arg0) @@ -8825,28 +8718,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1expanded) } #endif -#ifndef NO__1gtk_1expander_1set_1label -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -{ - jbyte *lparg1=NULL; - OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -/* - gtk_expander_set_label(arg0, (const gchar *)lparg1); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_expander_set_label) - if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1); - } - } -fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); - OS_NATIVE_EXIT(env, that, _1gtk_1expander_1set_1label_FUNC); -} -#endif - #ifndef NO__1gtk_1expander_1set_1label_1widget JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label_1widget) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) @@ -8883,26 +8754,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1add_1filter) } #endif -#ifndef NO__1gtk_1file_1chooser_1get_1current_1folder -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1current_1folder_FUNC); -/* - rc = (jintLong)gtk_file_chooser_get_current_folder(arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_current_folder) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); - } - } - OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1current_1folder_FUNC); - return rc; -} -#endif - #ifndef NO__1gtk_1file_1chooser_1get_1filename JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename) (JNIEnv *env, jclass that, jintLong arg0) @@ -9383,20 +9234,6 @@ fail: } #endif -#ifndef NO__1gtk_1frame_1set_1label -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -{ - jbyte *lparg1=NULL; - OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - gtk_frame_set_label((GtkFrame *)arg0, (const gchar *)lparg1); -fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); - OS_NATIVE_EXIT(env, that, _1gtk_1frame_1set_1label_FUNC); -} -#endif - #ifndef NO__1gtk_1frame_1set_1label_1widget JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label_1widget) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) @@ -9445,18 +9282,6 @@ fail: } #endif -#ifndef NO__1gtk_1get_1current_1event_1time -JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1current_1event_1time) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1get_1current_1event_1time_FUNC); - rc = (jint)gtk_get_current_event_time(); - OS_NATIVE_EXIT(env, that, _1gtk_1get_1current_1event_1time_FUNC); - return rc; -} -#endif - #ifndef NO__1gtk_1get_1default_1language JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1default_1language) (JNIEnv *env, jclass that) @@ -9481,16 +9306,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1event_1widget) } #endif -#ifndef NO__1gtk_1grab_1add -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1add) - (JNIEnv *env, jclass that, jintLong arg0) -{ - OS_NATIVE_ENTER(env, that, _1gtk_1grab_1add_FUNC); - gtk_grab_add((GtkWidget *)arg0); - OS_NATIVE_EXIT(env, that, _1gtk_1grab_1add_FUNC); -} -#endif - #ifndef NO__1gtk_1grab_1get_1current JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1grab_1get_1current) (JNIEnv *env, jclass that) @@ -9503,16 +9318,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1grab_1get_1current) } #endif -#ifndef NO__1gtk_1grab_1remove -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1remove) - (JNIEnv *env, jclass that, jintLong arg0) -{ - OS_NATIVE_ENTER(env, that, _1gtk_1grab_1remove_FUNC); - gtk_grab_remove((GtkWidget *)arg0); - OS_NATIVE_EXIT(env, that, _1gtk_1grab_1remove_FUNC); -} -#endif - #ifndef NO__1gtk_1hbox_1new JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hbox_1new) (JNIEnv *env, jclass that, jboolean arg0, jint arg1) 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 3eafa7c135..af1f2fabb3 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 = 1370; -int OS_nativeFunctionCallCount[1370]; +int OS_nativeFunctionCount = 1356; +int OS_nativeFunctionCallCount[1356]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -583,7 +583,6 @@ char * OS_nativeFunctionNames[] = { "_1gdk_1x11_1visual_1get_1xvisual", "_1gdk_1x11_1window_1lookup_1for_1display", "_1gtk_1accel_1group_1new", - "_1gtk_1accel_1groups_1activate", "_1gtk_1accel_1label_1set_1accel_1widget", "_1gtk_1accelerator_1get_1default_1mod_1mask", "_1gtk_1accelerator_1parse", @@ -624,13 +623,11 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1clipboard_1clear", "_1gtk_1clipboard_1get", "_1gtk_1clipboard_1set_1can_1store", - "_1gtk_1clipboard_1set_1with_1data", "_1gtk_1clipboard_1set_1with_1owner", "_1gtk_1clipboard_1store", "_1gtk_1clipboard_1wait_1for_1contents", "_1gtk_1color_1selection_1dialog_1new", "_1gtk_1color_1selection_1get_1current_1color", - "_1gtk_1color_1selection_1palette_1from_1string", "_1gtk_1color_1selection_1palette_1to_1string", "_1gtk_1color_1selection_1set_1current_1color", "_1gtk_1color_1selection_1set_1has_1palette", @@ -661,12 +658,10 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1drag_1finish", "_1gtk_1drag_1get_1data", "_1gtk_1drag_1set_1icon_1pixbuf", - "_1gtk_1drawing_1area_1new", "_1gtk_1editable_1copy_1clipboard", "_1gtk_1editable_1cut_1clipboard", "_1gtk_1editable_1delete_1selection", "_1gtk_1editable_1delete_1text", - "_1gtk_1editable_1get_1chars", "_1gtk_1editable_1get_1editable", "_1gtk_1editable_1get_1position", "_1gtk_1editable_1get_1selection_1bounds", @@ -683,7 +678,6 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1entry_1get_1text", "_1gtk_1entry_1get_1visibility", "_1gtk_1entry_1new", - "_1gtk_1entry_1set_1activates_1default", "_1gtk_1entry_1set_1alignment", "_1gtk_1entry_1set_1has_1frame", "_1gtk_1entry_1set_1icon_1from_1stock", @@ -694,16 +688,12 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1entry_1set_1visibility", "_1gtk_1entry_1text_1index_1to_1layout_1index", "_1gtk_1enumerate_1printers", - "_1gtk_1events_1pending", "_1gtk_1expander_1get_1expanded", - "_1gtk_1expander_1get_1label_1widget", "_1gtk_1expander_1new", "_1gtk_1expander_1set_1expanded", - "_1gtk_1expander_1set_1label", "_1gtk_1expander_1set_1label_1widget", "_1gtk_1file_1chooser_1add_1filter", "_1gtk_1file_1chooser_1dialog_1new", - "_1gtk_1file_1chooser_1get_1current_1folder", "_1gtk_1file_1chooser_1get_1filename", "_1gtk_1file_1chooser_1get_1filenames", "_1gtk_1file_1chooser_1get_1filter", @@ -731,17 +721,13 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1font_1selection_1dialog_1set_1font_1name", "_1gtk_1frame_1get_1label_1widget", "_1gtk_1frame_1new", - "_1gtk_1frame_1set_1label", "_1gtk_1frame_1set_1label_1widget", "_1gtk_1frame_1set_1shadow_1type", "_1gtk_1get_1current_1event", "_1gtk_1get_1current_1event_1state", - "_1gtk_1get_1current_1event_1time", "_1gtk_1get_1default_1language", "_1gtk_1get_1event_1widget", - "_1gtk_1grab_1add", "_1gtk_1grab_1get_1current", - "_1gtk_1grab_1remove", "_1gtk_1hbox_1new", "_1gtk_1hscale_1new", "_1gtk_1hscrollbar_1new", 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 2474c82561..de5c12c367 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 @@ -591,7 +591,6 @@ typedef enum { _1gdk_1x11_1visual_1get_1xvisual_FUNC, _1gdk_1x11_1window_1lookup_1for_1display_FUNC, _1gtk_1accel_1group_1new_FUNC, - _1gtk_1accel_1groups_1activate_FUNC, _1gtk_1accel_1label_1set_1accel_1widget_FUNC, _1gtk_1accelerator_1get_1default_1mod_1mask_FUNC, _1gtk_1accelerator_1parse_FUNC, @@ -632,13 +631,11 @@ typedef enum { _1gtk_1clipboard_1clear_FUNC, _1gtk_1clipboard_1get_FUNC, _1gtk_1clipboard_1set_1can_1store_FUNC, - _1gtk_1clipboard_1set_1with_1data_FUNC, _1gtk_1clipboard_1set_1with_1owner_FUNC, _1gtk_1clipboard_1store_FUNC, _1gtk_1clipboard_1wait_1for_1contents_FUNC, _1gtk_1color_1selection_1dialog_1new_FUNC, _1gtk_1color_1selection_1get_1current_1color_FUNC, - _1gtk_1color_1selection_1palette_1from_1string_FUNC, _1gtk_1color_1selection_1palette_1to_1string_FUNC, _1gtk_1color_1selection_1set_1current_1color_FUNC, _1gtk_1color_1selection_1set_1has_1palette_FUNC, @@ -669,12 +666,10 @@ typedef enum { _1gtk_1drag_1finish_FUNC, _1gtk_1drag_1get_1data_FUNC, _1gtk_1drag_1set_1icon_1pixbuf_FUNC, - _1gtk_1drawing_1area_1new_FUNC, _1gtk_1editable_1copy_1clipboard_FUNC, _1gtk_1editable_1cut_1clipboard_FUNC, _1gtk_1editable_1delete_1selection_FUNC, _1gtk_1editable_1delete_1text_FUNC, - _1gtk_1editable_1get_1chars_FUNC, _1gtk_1editable_1get_1editable_FUNC, _1gtk_1editable_1get_1position_FUNC, _1gtk_1editable_1get_1selection_1bounds_FUNC, @@ -691,7 +686,6 @@ typedef enum { _1gtk_1entry_1get_1text_FUNC, _1gtk_1entry_1get_1visibility_FUNC, _1gtk_1entry_1new_FUNC, - _1gtk_1entry_1set_1activates_1default_FUNC, _1gtk_1entry_1set_1alignment_FUNC, _1gtk_1entry_1set_1has_1frame_FUNC, _1gtk_1entry_1set_1icon_1from_1stock_FUNC, @@ -702,16 +696,12 @@ typedef enum { _1gtk_1entry_1set_1visibility_FUNC, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC, _1gtk_1enumerate_1printers_FUNC, - _1gtk_1events_1pending_FUNC, _1gtk_1expander_1get_1expanded_FUNC, - _1gtk_1expander_1get_1label_1widget_FUNC, _1gtk_1expander_1new_FUNC, _1gtk_1expander_1set_1expanded_FUNC, - _1gtk_1expander_1set_1label_FUNC, _1gtk_1expander_1set_1label_1widget_FUNC, _1gtk_1file_1chooser_1add_1filter_FUNC, _1gtk_1file_1chooser_1dialog_1new_FUNC, - _1gtk_1file_1chooser_1get_1current_1folder_FUNC, _1gtk_1file_1chooser_1get_1filename_FUNC, _1gtk_1file_1chooser_1get_1filenames_FUNC, _1gtk_1file_1chooser_1get_1filter_FUNC, @@ -739,17 +729,13 @@ typedef enum { _1gtk_1font_1selection_1dialog_1set_1font_1name_FUNC, _1gtk_1frame_1get_1label_1widget_FUNC, _1gtk_1frame_1new_FUNC, - _1gtk_1frame_1set_1label_FUNC, _1gtk_1frame_1set_1label_1widget_FUNC, _1gtk_1frame_1set_1shadow_1type_FUNC, _1gtk_1get_1current_1event_FUNC, _1gtk_1get_1current_1event_1state_FUNC, - _1gtk_1get_1current_1event_1time_FUNC, _1gtk_1get_1default_1language_FUNC, _1gtk_1get_1event_1widget_FUNC, - _1gtk_1grab_1add_FUNC, _1gtk_1grab_1get_1current_FUNC, - _1gtk_1grab_1remove_FUNC, _1gtk_1hbox_1new_FUNC, _1gtk_1hscale_1new_FUNC, _1gtk_1hscrollbar_1new_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 adc603bc4a..bb539bd1d4 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 @@ -5435,20 +5435,6 @@ public static final int /*long*/ gtk_accel_group_new() { lock.unlock(); } } -/** - * @param accelGroup cast=(GObject *) - * @param accelKey cast=(guint) - * @param accelMods cast=(GdkModifierType) - */ -public static final native boolean _gtk_accel_groups_activate(int /*long*/ accelGroup, int accelKey, int accelMods); -public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, int accelKey, int accelMods) { - lock.lock(); - try { - return _gtk_accel_groups_activate(accelGroup, accelKey, accelMods); - } finally { - lock.unlock(); - } -} /** * @param accel_label cast=(GtkAccelLabel *) * @param accel_widget cast=(GtkWidget *) @@ -5875,23 +5861,6 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) { lock.unlock(); } } -/** - * @param clipboard cast=(GtkClipboard *) - * @param target cast=(const GtkTargetEntry *) - * @param n_targets cast=(guint) - * @param get_func cast=(GtkClipboardGetFunc) - * @param clear_func cast=(GtkClipboardClearFunc) - * @param user_data cast=(GObject *) - */ -public static final native boolean _gtk_clipboard_set_with_data(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data); -public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data) { - lock.lock(); - try { - return _gtk_clipboard_set_with_data(clipboard, target, n_targets, get_func, clear_func, user_data); - } finally { - lock.unlock(); - } -} /** * @param clipboard cast=(GtkClipboard *) * @param target cast=(const GtkTargetEntry *) @@ -5973,20 +5942,6 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo lock.unlock(); } } -/** - * @param str cast=(const gchar *) - * @param colors cast=(GdkColor **) - * @param n_colors cast=(gint *) - */ -public static final native void _gtk_color_selection_palette_from_string(byte[] str, int /*long*/ colors, int[] n_colors); -public static final void gtk_color_selection_palette_from_string(byte[] str, int /*long*/ colors, int[] n_colors) { - lock.lock(); - try { - _gtk_color_selection_palette_from_string(str, colors, n_colors); - } finally { - lock.unlock(); - } -} /** * @param colors cast=(GdkColor *) * @param n_colors cast=(gint) @@ -6345,15 +6300,6 @@ public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*lo lock.unlock(); } } -public static final native int /*long*/ _gtk_drawing_area_new(); -public static final int /*long*/ gtk_drawing_area_new() { - lock.lock(); - try { - return _gtk_drawing_area_new(); - } finally { - lock.unlock(); - } -} /** @param editable cast=(GtkEditable *) */ public static final native void _gtk_editable_copy_clipboard(int /*long*/ editable); public static final void gtk_editable_copy_clipboard(int /*long*/ editable) { @@ -6398,20 +6344,6 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta lock.unlock(); } } -/** - * @param editable cast=(GtkEditable *) - * @param start_pos cast=(gint) - * @param end_pos cast=(gint) - */ -public static final native int /*long*/ _gtk_editable_get_chars(int /*long*/ editable, int start_pos, int end_pos); -public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, int start_pos, int end_pos) { - lock.lock(); - try { - return _gtk_editable_get_chars(editable, start_pos, end_pos); - } finally { - lock.unlock(); - } -} /** @param editable cast=(GtkEditable *) */ public static final native boolean _gtk_editable_get_editable(int /*long*/ editable); public static final boolean gtk_editable_get_editable(int /*long*/ editable) { @@ -6610,19 +6542,6 @@ public static final int /*long*/ gtk_entry_new() { lock.unlock(); } } -/** - * @param entry cast=(GtkEntry *) - * @param setting cast=(gboolean) - */ -public static final native void _gtk_entry_set_activates_default(int /*long*/ entry, boolean setting); -public static final void gtk_entry_set_activates_default(int /*long*/ entry, boolean setting) { - lock.lock(); - try { - _gtk_entry_set_activates_default(entry, setting); - } finally { - lock.unlock(); - } -} /** * @method flags=dynamic * @param entry cast=(GtkEntry *) @@ -6722,15 +6641,6 @@ public static final void gtk_entry_set_visibility(int /*long*/ entry, boolean vi lock.unlock(); } } -public static final native int _gtk_events_pending(); -public static final int gtk_events_pending() { - lock.lock(); - try { - return _gtk_events_pending(); - } finally { - lock.unlock(); - } -} /** @method flags=dynamic */ public static final native boolean _gtk_expander_get_expanded(int /*long*/ expander); public static final boolean gtk_expander_get_expanded(int /*long*/ expander) { @@ -6741,16 +6651,6 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) { lock.unlock(); } } -/** @method flags=dynamic */ -public static final native int /*long*/ _gtk_expander_get_label_widget(int /*long*/ expander); -public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expander) { - lock.lock(); - try { - return _gtk_expander_get_label_widget(expander); - } finally { - lock.unlock(); - } -} /** * @method flags=dynamic * @param label cast=(const gchar *) @@ -6774,19 +6674,6 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea lock.unlock(); } } -/** - * @method flags=dynamic - * @param label cast=(const gchar *) - */ -public static final native void _gtk_expander_set_label(int /*long*/ expander, byte[] label); -public static final void gtk_expander_set_label(int /*long*/ expander, byte[] label) { - lock.lock(); - try { - _gtk_expander_set_label(expander, label); - } finally { - lock.unlock(); - } -} /** @method flags=dynamic */ public static final native void _gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget); public static final void gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget) { @@ -6818,16 +6705,6 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int / } } /** @method flags=dynamic */ -public static final native int /*long*/ _gtk_file_chooser_get_current_folder(int /*long*/ chooser); -public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*/ chooser) { - lock.lock(); - try { - return _gtk_file_chooser_get_current_folder(chooser); - } finally { - lock.unlock(); - } -} -/** @method flags=dynamic */ public static final native int /*long*/ _gtk_file_chooser_get_filename(int /*long*/ chooser); public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ chooser) { lock.lock(); @@ -7107,19 +6984,6 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame) lock.unlock(); } } -/** - * @param frame cast=(GtkFrame *) - * @param label cast=(const gchar *) - */ -public static final native void _gtk_frame_set_label(int /*long*/ frame, byte[] label); -public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) { - lock.lock(); - try { - _gtk_frame_set_label(frame, label); - } finally { - lock.unlock(); - } -} /** * @param frame cast=(GtkFrame *) * @param label_widget cast=(GtkWidget *) @@ -7165,15 +7029,6 @@ public static final boolean gtk_get_current_event_state (int[] state) { lock.unlock(); } } -public static final native int _gtk_get_current_event_time(); -public static final int gtk_get_current_event_time() { - lock.lock(); - try { - return _gtk_get_current_event_time(); - } finally { - lock.unlock(); - } -} public static final native int /*long*/ _gtk_get_default_language(); public static final int /*long*/ gtk_get_default_language() { lock.lock(); @@ -7193,16 +7048,6 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) { lock.unlock(); } } -/** @param widget cast=(GtkWidget *) */ -public static final native void _gtk_grab_add(int /*long*/ widget); -public static final void gtk_grab_add(int /*long*/ widget) { - lock.lock(); - try { - _gtk_grab_add(widget); - } finally { - lock.unlock(); - } -} public static final native int /*long*/ _gtk_grab_get_current(); public static final int /*long*/ gtk_grab_get_current() { lock.lock(); @@ -7212,16 +7057,6 @@ public static final int /*long*/ gtk_grab_get_current() { lock.unlock(); } } -/** @param widget cast=(GtkWidget *) */ -public static final native void _gtk_grab_remove(int /*long*/ widget); -public static final void gtk_grab_remove(int /*long*/ widget) { - lock.lock(); - try { - _gtk_grab_remove(widget); - } finally { - lock.unlock(); - } -} /** * @param homogeneous cast=(gboolean) * @param spacing cast=(gint) -- cgit