Use gtk_render_focus instead of gtk_paint_focus for GTK+ 3

1 files changed, 17 insertions, 1 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
index d1963ec87a..f2e4407cf3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
@@ -803,7 +803,7 @@ public void drawFocus(int x, int y, int width, int height) {
 		Cairo.cairo_restore(cairo);
 		return;
 	}
-	OS.gtk_paint_focus(style, data.drawable, OS.GTK_STATE_NORMAL, null, data.device.shellHandle, new byte[1], x, y, width, height);
+	gtk_render_focus (style, data.drawable, OS.GTK_STATE_NORMAL, null, data.device.shellHandle, new byte[1], x, y, width, height);
 }
 
 /**
@@ -4204,4 +4204,20 @@ public String toString () {
 	return "GC {" + handle + "}";
 }
 
+void gtk_render_focus (long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
+	if (OS.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
+		long /*int*/ cairo = OS.gdk_cairo_create (window);
+		long /*int*/  context = OS.gtk_widget_get_style_context (style);
+		OS.gtk_style_context_save (context);
+		OS.gtk_style_context_set_state (context, OS.gtk_widget_get_state_flags (widget));
+		Cairo.cairo_save (cairo);
+		OS.gtk_render_focus(context, cairo, x, y, width, height);
+		Cairo.cairo_restore (cairo);
+		OS.gtk_style_context_restore (context);
+		Cairo.cairo_destroy(cairo);
+		
+	} else {
+		OS.gtk_paint_focus (style, window, state_type, area, widget, detail, x, y, width, height);
+	}
+}
 }