diff options
author | Alexander Kurtakov | 2016-12-14 16:10:21 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2016-12-14 16:10:32 +0000 |
commit | 2a32fc9def3cbbb5db971f5873c47b5c79127318 (patch) | |
tree | 900954936c003fa4553beab877685fbf2fb3fbea /bundles/org.eclipse.swt/Eclipse SWT PI | |
parent | 88c6ff9c59f4e0512cb3710f7bce1fd5d15a284b (diff) | |
download | eclipse.platform.swt-2a32fc9def3cbbb5db971f5873c47b5c79127318.tar.gz eclipse.platform.swt-2a32fc9def3cbbb5db971f5873c47b5c79127318.tar.xz eclipse.platform.swt-2a32fc9def3cbbb5db971f5873c47b5c79127318.zip |
Revert "Bug 503431 - [wayland] CTabFolder slow when switching tabs (DnD logic issue on wayland)"
This reverts commit b48d644b780b20250a7212b8992d1d42bdd70d32.
Change-Id: I6df575c1335ebae46f8bea51e4b1d4dc99b4c9e5
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI')
5 files changed, 2 insertions, 201 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 efa106deaa..75e7811361 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 @@ -9165,54 +9165,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1enumerate_1printers) } #endif -#ifndef NO__1gtk_1event_1box_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1event_1box_1new) - (JNIEnv *env, jclass that) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1event_1box_1new_FUNC); - rc = (jintLong)gtk_event_box_new(); - OS_NATIVE_EXIT(env, that, _1gtk_1event_1box_1new_FUNC); - return rc; -} -#endif - -#ifndef NO__1gtk_1event_1controller_1handle_1event -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1event_1controller_1handle_1event) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -{ - OS_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1handle_1event_FUNC); -/* - gtk_event_controller_handle_event(arg0, arg1); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_event_controller_handle_event) - if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); - } - } - OS_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1handle_1event_FUNC); -} -#endif - -#ifndef NO__1gtk_1event_1controller_1set_1propagation_1phase -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1event_1controller_1set_1propagation_1phase) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) -{ - OS_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1set_1propagation_1phase_FUNC); -/* - gtk_event_controller_set_propagation_phase(arg0, arg1); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_event_controller_set_propagation_phase) - if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); - } - } - OS_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1set_1propagation_1phase_FUNC); -} -#endif - #ifndef NO__1gtk_1expander_1get_1expanded JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded) (JNIEnv *env, jclass that, jintLong arg0) @@ -9759,69 +9711,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1shadow_1type) } #endif -#ifndef NO__1gtk_1gesture_1drag_1get_1offset -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1gesture_1drag_1get_1offset) - (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2) -{ - jdouble *lparg1=NULL; - jdouble *lparg2=NULL; - OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1drag_1get_1offset_FUNC); - if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail; -/* - gtk_gesture_drag_get_offset(arg0, lparg1, lparg2); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_gesture_drag_get_offset) - if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2); - } - } -fail: - if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0); - if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0); - OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1drag_1get_1offset_FUNC); -} -#endif - -#ifndef NO__1gtk_1gesture_1drag_1new -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1gesture_1drag_1new) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1drag_1new_FUNC); -/* - rc = (jintLong)gtk_gesture_drag_new((GtkWidget *)arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_gesture_drag_new) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); - } - } - OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1drag_1new_FUNC); - return rc; -} -#endif - -#ifndef NO__1gtk_1gesture_1single_1set_1button -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1gesture_1single_1set_1button) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) -{ - OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1single_1set_1button_FUNC); -/* - gtk_gesture_single_set_button(arg0, arg1); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_gesture_single_set_button) - if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); - } - } - OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1single_1set_1button_FUNC); -} -#endif - #ifndef NO__1gtk_1get_1current_1event JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1current_1event) (JNIEnv *env, jclass that) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h index 178d57ada6..4de6915c58 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h @@ -282,11 +282,6 @@ #define FcConfigAppFontAddFile_LIB LIB_FONTCONFIG // GTK3 only -#define gtk_event_controller_handle_event_LIB LIB_GTK -#define gtk_event_controller_set_propagation_phase_LIB LIB_GTK -#define gtk_gesture_drag_new_LIB LIB_GTK -#define gtk_gesture_drag_get_offset_LIB LIB_GTK -#define gtk_gesture_single_set_button_LIB LIB_GTK #define gtk_widget_draw_LIB LIB_GTK #define gtk_widget_override_color_LIB LIB_GTK #define gtk_widget_override_background_color_LIB LIB_GTK 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 56dede0b06..a30205a0c5 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 @@ -728,9 +728,6 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1entry_1set_1width_1chars", "_1gtk_1entry_1text_1index_1to_1layout_1index", "_1gtk_1enumerate_1printers", - "_1gtk_1event_1box_1new", - "_1gtk_1event_1controller_1handle_1event", - "_1gtk_1event_1controller_1set_1propagation_1phase", "_1gtk_1expander_1get_1expanded", "_1gtk_1expander_1new", "_1gtk_1expander_1set_1expanded", @@ -777,9 +774,6 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1frame_1new", "_1gtk_1frame_1set_1label_1widget", "_1gtk_1frame_1set_1shadow_1type", - "_1gtk_1gesture_1drag_1get_1offset", - "_1gtk_1gesture_1drag_1new", - "_1gtk_1gesture_1single_1set_1button", "_1gtk_1get_1current_1event", "_1gtk_1get_1current_1event_1state", "_1gtk_1get_1default_1language", 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 24a391d0bb..ffeece926b 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 @@ -738,9 +738,6 @@ typedef enum { _1gtk_1entry_1set_1width_1chars_FUNC, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC, _1gtk_1enumerate_1printers_FUNC, - _1gtk_1event_1box_1new_FUNC, - _1gtk_1event_1controller_1handle_1event_FUNC, - _1gtk_1event_1controller_1set_1propagation_1phase_FUNC, _1gtk_1expander_1get_1expanded_FUNC, _1gtk_1expander_1new_FUNC, _1gtk_1expander_1set_1expanded_FUNC, @@ -787,9 +784,6 @@ typedef enum { _1gtk_1frame_1new_FUNC, _1gtk_1frame_1set_1label_1widget_FUNC, _1gtk_1frame_1set_1shadow_1type_FUNC, - _1gtk_1gesture_1drag_1get_1offset_FUNC, - _1gtk_1gesture_1drag_1new_FUNC, - _1gtk_1gesture_1single_1set_1button_FUNC, _1gtk_1get_1current_1event_FUNC, _1gtk_1get_1current_1event_1state_FUNC, _1gtk_1get_1default_1language_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 3a95413445..e7dbea0b9a 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 @@ -7739,33 +7739,9 @@ public static final void gtk_file_chooser_set_select_multiple(long /*int*/ choos } } /** - * @method flags=dynamic - */ -public static final native void _gtk_event_controller_set_propagation_phase(long /*int*/ controller, int phase); -public static final void gtk_event_controller_set_propagation_phase(long /*int*/ controller, int phase) { - lock.lock(); - try { - _gtk_event_controller_set_propagation_phase(controller, phase); - } finally { - lock.unlock(); - } -} -/** - * @method flags=dynamic + * @param filter cast=(GtkFileFilter *) + * @param pattern cast=(const gchar *) */ -public static final native void _gtk_event_controller_handle_event(long /*int*/ gesture, long /*int*/ event); -public static final void gtk_event_controller_handle_event(long /*int*/ gesture, long /*int*/ event) { - lock.lock(); - try { - _gtk_event_controller_handle_event(gesture, event); - } finally { - lock.unlock(); - } -} -/** -* @param filter cast=(GtkFileFilter *) -* @param pattern cast=(const gchar *) -*/ public static final native void _gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern); public static final void gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern) { lock.lock(); @@ -7832,43 +7808,6 @@ public static final long /*int*/ gtk_fixed_new() { } } /** - * @method flags=dynamic - * @param widget cast=(GtkWidget *) - */ -public static final native long /*int*/ _gtk_gesture_drag_new(long /*int*/ widget); -public static final long /*int*/ gtk_gesture_drag_new(long /*int*/ widget) { - lock.lock(); - try { - return _gtk_gesture_drag_new(widget); - } finally { - lock.unlock(); - } -} -/** - * @method flags=dynamic - */ -public static final native void _gtk_gesture_single_set_button(long /*int*/ gesture, int button); -public static final void gtk_gesture_single_set_button(long /*int*/ gesture, int button) { - lock.lock(); - try { - _gtk_gesture_single_set_button(gesture, button); - } finally { - lock.unlock(); - } -} -/** - * @method flags=dynamic - */ -public static final native void _gtk_gesture_drag_get_offset(long /*int*/ gesture, double[] x, double[] y); -public static final void gtk_gesture_drag_get_offset(long /*int*/ gesture, double[] x, double[] y) { - lock.lock(); - try { - _gtk_gesture_drag_get_offset(gesture, x, y); - } finally { - lock.unlock(); - } -} -/** * @param widget cast=(GtkWidget *) * @param has_window cast=(gboolean) */ @@ -8216,16 +8155,6 @@ public static final void gtk_box_set_homogeneous(long /*int*/ box, boolean homog lock.unlock(); } } - -public static final native long /*int*/ _gtk_event_box_new(); -public static final long /*int*/ gtk_event_box_new() { - lock.lock(); - try { - return _gtk_event_box_new(); - } finally { - lock.unlock(); - } -} /** * @method flags=dynamic [GTK2/GTK3; 3.2 deprecated] * @param adjustment cast=(GtkAdjustment *) |