Use gtk_render_handle() instead of gtk_paint_handle() for GTK+ 3gtk3_render_handle

6 files changed, 94 insertions, 5 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 90c1ebac16..95b1e942cb 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
@@ -11023,7 +11023,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1handle)
 	OS_NATIVE_ENTER(env, that, _1gtk_1paint_1handle_FUNC);
 	if (arg4) if ((lparg4 = getGdkRectangleFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	gtk_paint_handle((GtkStyle *)arg0, (GdkWindow *)arg1, arg2, arg3, lparg4, (GtkWidget *)arg5, (const gchar *)lparg6, arg7, arg8, arg9, arg10, arg11);
+/*
+	gtk_paint_handle(arg0, (GdkWindow *)arg1, arg2, arg3, lparg4, (GtkWidget *)arg5, (const gchar *)lparg6, arg7, arg8, arg9, arg10, arg11);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_paint_handle)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, GdkWindow *, jint, jint, GdkRectangle *, GtkWidget *, const gchar *, jint, jint, jint, jint, jint))fp)(arg0, (GdkWindow *)arg1, arg2, arg3, lparg4, (GtkWidget *)arg5, (const gchar *)lparg6, arg7, arg8, arg9, arg10, arg11);
+		}
+	}
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseByteArrayElements(env, arg6, lparg6, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1paint_1handle_FUNC);
@@ -12317,6 +12325,24 @@ fail:
 }
 #endif
 
+#ifndef NO__1gtk_1render_1handle
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1render_1handle)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
+{
+	OS_NATIVE_ENTER(env, that, _1gtk_1render_1handle_FUNC);
+/*
+	gtk_render_handle(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_render_handle)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, cairo_t *, gdouble, gdouble, gdouble, gdouble))fp)(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gtk_1render_1handle_FUNC);
+}
+#endif
+
 #ifndef NO__1gtk_1scale_1set_1digits
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1digits)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
@@ -15780,6 +15806,26 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1style)
 }
 #endif
 
+#ifndef NO__1gtk_1widget_1get_1style_1context
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1style_1context)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1style_1context_FUNC);
+/*
+	rc = (jintLong)gtk_widget_get_style_context((GtkWidget *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_widget_get_style_context)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1style_1context_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO__1gtk_1widget_1get_1tooltip_1text
 JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1tooltip_1text)
 	(JNIEnv *env, jclass that, jintLong arg0)
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 09073e9c3e..6da04a50ac 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
@@ -135,6 +135,7 @@
 #define gtk_menu_shell_set_take_focus_LIB LIB_GTK
 #define gtk_menu_tool_button_new_LIB LIB_GTK
 #define gtk_window_set_keep_below_LIB LIB_GTK
+#define gtk_paint_handle_LIB LIB_GTK
 #define gtk_set_locale_LIB LIB_GTK
 #define gtk_toolbar_set_orientation_LIB LIB_GTK
 #define gtk_tooltip_trigger_tooltip_query_LIB LIB_GTK
@@ -226,9 +227,11 @@
 #define gtk_widget_set_can_focus_LIB LIB_GTK
 #define gtk_widget_set_mapped_LIB LIB_GTK
 #define gtk_widget_set_sensitive_LIB LIB_GTK
+#define gtk_widget_get_style_context_LIB LIB_GTK
 #define gtk_widget_set_receives_default_LIB LIB_GTK
 #define gtk_widget_set_visible_LIB LIB_GTK
 #define gtk_range_get_slider_range_LIB LIB_GTK
+#define gtk_render_handle_LIB LIB_GTK
 #define gdk_pango_context_set_colormap_LIB LIB_GDK
 #define gdk_x11_screen_get_window_manager_name_LIB LIB_GDK
 #define gdk_x11_screen_lookup_visual_LIB LIB_GDK
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 119f1c66aa..34a7eb436a 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 = 1335;
-int OS_nativeFunctionCallCount[1335];
+int OS_nativeFunctionCount = 1337;
+int OS_nativeFunctionCallCount[1337];
 char * OS_nativeFunctionNames[] = {
 #ifndef JNI64
 	"Call__IIII",
@@ -938,6 +938,7 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1rc_1style_1set_1color_1flags",
 	"_1gtk_1rc_1style_1set_1fg",
 	"_1gtk_1rc_1style_1set_1text",
+	"_1gtk_1render_1handle",
 	"_1gtk_1scale_1set_1digits",
 	"_1gtk_1scale_1set_1draw_1value",
 	"_1gtk_1scrolled_1window_1add_1with_1viewport",
@@ -1239,6 +1240,7 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1widget_1get_1sensitive",
 	"_1gtk_1widget_1get_1size_1request",
 	"_1gtk_1widget_1get_1style",
+	"_1gtk_1widget_1get_1style_1context",
 	"_1gtk_1widget_1get_1tooltip_1text",
 	"_1gtk_1widget_1get_1toplevel",
 	"_1gtk_1widget_1get_1visible",
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 20250dbe2b..8d23f4819a 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
@@ -946,6 +946,7 @@ typedef enum {
 	_1gtk_1rc_1style_1set_1color_1flags_FUNC,
 	_1gtk_1rc_1style_1set_1fg_FUNC,
 	_1gtk_1rc_1style_1set_1text_FUNC,
+	_1gtk_1render_1handle_FUNC,
 	_1gtk_1scale_1set_1digits_FUNC,
 	_1gtk_1scale_1set_1draw_1value_FUNC,
 	_1gtk_1scrolled_1window_1add_1with_1viewport_FUNC,
@@ -1247,6 +1248,7 @@ typedef enum {
 	_1gtk_1widget_1get_1sensitive_FUNC,
 	_1gtk_1widget_1get_1size_1request_FUNC,
 	_1gtk_1widget_1get_1style_FUNC,
+	_1gtk_1widget_1get_1style_1context_FUNC,
 	_1gtk_1widget_1get_1tooltip_1text_FUNC,
 	_1gtk_1widget_1get_1toplevel_FUNC,
 	_1gtk_1widget_1get_1visible_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 c2310b7878..261f9c5fec 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
@@ -8284,7 +8284,7 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
 	}
 }
 /**
- * @param style cast=(GtkStyle *)
+ * @method flags=dynamic
  * @param window cast=(GdkWindow *)
  * @param area flags=no_out
  * @param widget cast=(GtkWidget *)
@@ -8300,6 +8300,23 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
 	}
 }
 /**
+ * @method flags=dynamic
+ * @param cr cast=(cairo_t *)
+ * @param x cast=(gdouble)
+ * @param y cast=(gdouble)
+ * @param width cast=(gdouble)
+ * @param height cast=(gdouble)
+ */
+public static final native void _gtk_render_handle(int /*long*/ context, int /*long*/ cr,  double x , double y, double width, double height);
+public static final void gtk_render_handle(int /*long*/ context, int /*long*/ cr,  double x , double y, double width, double height) {
+	lock.lock();
+	try {
+		_gtk_render_handle(context,cr, x ,y, width, height);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
  * @param style cast=(GtkStyle *)
  * @param window cast=(GdkWindow *)
  * @param widget cast=(GtkWidget *)
@@ -12327,6 +12344,19 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
 	}
 }
 /**
+ * @method flags=dynamic 
+ * @param widget cast=(GtkWidget *)
+ */
+public static final native int /*long*/ _gtk_widget_get_style_context(int /*long*/ widget);
+public static final int /*long*/ gtk_widget_get_style_context(int /*long*/ widget) {
+	lock.lock();
+	try {
+		return _gtk_widget_get_style_context(widget);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
  * @param widget cast=(GtkWidget *)
  * @param width cast=(gint *)
  * @param height cast=(gint *)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index e23576990a..3357c27338 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -161,7 +161,13 @@ boolean drawGripper (int x, int y, int width, int height, boolean vertical) {
 	if (window == 0) return false;
 	int orientation = vertical ? OS.GTK_ORIENTATION_HORIZONTAL : OS.GTK_ORIENTATION_VERTICAL;
 	if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x;
-	OS.gtk_paint_handle (OS.gtk_widget_get_style (paintHandle), window, OS.GTK_STATE_NORMAL, OS.GTK_SHADOW_OUT, null, paintHandle, new byte [1], x, y, width, height, orientation);
+	if (OS.GTK_VERSION >= OS.VERSION (3, 0, 0)) {
+		int /*long*/ cairo = OS.gdk_cairo_create (window);
+		int /*long*/ context = OS.gtk_widget_get_style_context(paintHandle);
+		OS.gtk_render_handle(context, cairo, x, y, width, height);
+	} else {
+		OS.gtk_paint_handle (OS.gtk_widget_get_style (paintHandle), window, OS.GTK_STATE_NORMAL, OS.GTK_SHADOW_OUT, null, paintHandle, new byte [1], x, y, width, height, orientation);
+	}
 	return true;
 }