diff options
author | Eric Williams | 2019-10-24 20:12:23 +0000 |
---|---|---|
committer | Eric Williams | 2019-10-25 13:21:39 +0000 |
commit | 894fbbcf2964c434da1c6bd3695634e7ab423fee (patch) | |
tree | c1214deabee4635c65f7fd9dfc16dd710a82a9a2 /bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library | |
parent | d17f2303152f85b1cc84f9ca5d702a6e16705fdb (diff) | |
download | eclipse.platform.swt-894fbbcf2964c434da1c6bd3695634e7ab423fee.tar.gz eclipse.platform.swt-894fbbcf2964c434da1c6bd3695634e7ab423fee.tar.xz eclipse.platform.swt-894fbbcf2964c434da1c6bd3695634e7ab423fee.zip |
Bug 551982: [GTK] Nothing is rendered when creating new GC on canvas
Revert back to using gdk_cairo_create() for all GTK3 versions. GTK4
uses something else, and gdk_window_begin_draw_frame() is gone there
anyway. gdk_cairo_create() is much more stable and hasn't introduced
any regressions.
Tested on GTK3.24 using the snippet provided. No AllNonBrowser JUnit
tests fail.
Change-Id: Ic405edaebd7e6ffa3a199f74b2d8b9dc22d12e29
Signed-off-by: Eric Williams <ericwill@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library')
3 files changed, 0 insertions, 66 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 b3aa96a79d..c9bd6bf74a 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 @@ -922,26 +922,6 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1drag_1status) } #endif -#ifndef NO__1gdk_1drawing_1context_1get_1cairo_1context -JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1drawing_1context_1get_1cairo_1context) - (JNIEnv *env, jclass that, jlong arg0) -{ - jlong rc = 0; - GDK_NATIVE_ENTER(env, that, _1gdk_1drawing_1context_1get_1cairo_1context_FUNC); -/* - rc = (jlong)gdk_drawing_context_get_cairo_context((GdkDrawingContext *)arg0); -*/ - { - GDK_LOAD_FUNCTION(fp, gdk_drawing_context_get_cairo_context) - if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(GdkDrawingContext *))fp)((GdkDrawingContext *)arg0); - } - } - GDK_NATIVE_EXIT(env, that, _1gdk_1drawing_1context_1get_1cairo_1context_FUNC); - return rc; -} -#endif - #ifndef NO__1gdk_1event_1copy JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1event_1copy) (JNIEnv *env, jclass that, jlong arg0) @@ -2759,26 +2739,6 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1visual_1get_1depth) } #endif -#ifndef NO__1gdk_1window_1begin_1draw_1frame -JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1begin_1draw_1frame) - (JNIEnv *env, jclass that, jlong arg0, jlong arg1) -{ - jlong rc = 0; - GDK_NATIVE_ENTER(env, that, _1gdk_1window_1begin_1draw_1frame_FUNC); -/* - rc = (jlong)gdk_window_begin_draw_frame((GdkWindow *)arg0, (cairo_region_t *)arg1); -*/ - { - GDK_LOAD_FUNCTION(fp, gdk_window_begin_draw_frame) - if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(GdkWindow *, cairo_region_t *))fp)((GdkWindow *)arg0, (cairo_region_t *)arg1); - } - } - GDK_NATIVE_EXIT(env, that, _1gdk_1window_1begin_1draw_1frame_FUNC); - return rc; -} -#endif - #ifndef NO__1gdk_1window_1create_1similar_1surface JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1create_1similar_1surface) (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3) @@ -2801,26 +2761,6 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1destroy) } #endif -#ifndef NO__1gdk_1window_1end_1draw_1frame -JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1window_1end_1draw_1frame) - (JNIEnv *env, jclass that, jlong arg0, jlong arg1) -{ - jlong rc = 0; - GDK_NATIVE_ENTER(env, that, _1gdk_1window_1end_1draw_1frame_FUNC); -/* - rc = (jlong)gdk_window_end_draw_frame((GdkWindow *)arg0, (GdkDrawingContext *)arg1); -*/ - { - GDK_LOAD_FUNCTION(fp, gdk_window_end_draw_frame) - if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(GdkWindow *, GdkDrawingContext *))fp)((GdkWindow *)arg0, (GdkDrawingContext *)arg1); - } - } - GDK_NATIVE_EXIT(env, that, _1gdk_1window_1end_1draw_1frame_FUNC); - return rc; -} -#endif - #ifndef NO__1gdk_1window_1focus JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1focus) (JNIEnv *env, jclass that, jlong 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 55747011df..561cd7f972 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 @@ -87,7 +87,6 @@ char * GDK_nativeFunctionNames[] = { "_1gdk_1drag_1context_1get_1selected_1action", "_1gdk_1drag_1context_1list_1targets", "_1gdk_1drag_1status", - "_1gdk_1drawing_1context_1get_1cairo_1context", "_1gdk_1event_1copy", "_1gdk_1event_1free", "_1gdk_1event_1get", @@ -213,10 +212,8 @@ char * GDK_nativeFunctionNames[] = { "_1gdk_1unicode_1to_1keyval", "_1gdk_1utf8_1to_1string_1target", "_1gdk_1visual_1get_1depth", - "_1gdk_1window_1begin_1draw_1frame", "_1gdk_1window_1create_1similar_1surface", "_1gdk_1window_1destroy", - "_1gdk_1window_1end_1draw_1frame", "_1gdk_1window_1focus", "_1gdk_1window_1get_1children", "_1gdk_1window_1get_1device_1position", 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 e484f05a7b..87d3bdfb1b 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 @@ -97,7 +97,6 @@ typedef enum { _1gdk_1drag_1context_1get_1selected_1action_FUNC, _1gdk_1drag_1context_1list_1targets_FUNC, _1gdk_1drag_1status_FUNC, - _1gdk_1drawing_1context_1get_1cairo_1context_FUNC, _1gdk_1event_1copy_FUNC, _1gdk_1event_1free_FUNC, _1gdk_1event_1get_FUNC, @@ -223,10 +222,8 @@ typedef enum { _1gdk_1unicode_1to_1keyval_FUNC, _1gdk_1utf8_1to_1string_1target_FUNC, _1gdk_1visual_1get_1depth_FUNC, - _1gdk_1window_1begin_1draw_1frame_FUNC, _1gdk_1window_1create_1similar_1surface_FUNC, _1gdk_1window_1destroy_FUNC, - _1gdk_1window_1end_1draw_1frame_FUNC, _1gdk_1window_1focus_FUNC, _1gdk_1window_1get_1children_FUNC, _1gdk_1window_1get_1device_1position_FUNC, |