110163 - X Window System error, using Swing system look and feel, rendering SVG using SWT_AWT in non-top stack layout

1 files changed, 12 insertions, 1 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
index ebb87bb219..ea3070bf9f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
@@ -15,7 +15,8 @@ import java.lang.reflect.Method;
 
 /* SWT Imports */
 import org.eclipse.swt.*;
-import org.eclipse.swt.internal.Library;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.Device;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Shell;
@@ -77,6 +78,16 @@ static synchronized void loadLibrary () {
 static synchronized void initializeSwing() {
 	if (swingInitialized) return;
 	swingInitialized = true;
+	/*
+	* Feature in GTK.  The default X error handler
+	* for GTK calls exit() after printing the X error.
+	* Normally, this isn't that big a problem for SWT
+	* applications because they don't cause X errors.
+	* However, sometimes X errors are generated by AWT
+	* that make SWT exit.  The fix is to hide all X
+	* errors when AWT is running.
+	*/
+	OS.gdk_error_trap_push();
 	try {
 		/* Initialize the default focus traversal policy */
 		Class[] emptyClass = new Class[0];