186043 - SWT_AWT not working in CTabFolder with JDK 6 on Linux

1 files changed, 30 insertions, 12 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java
index e3570c0584..a61c5551d4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java
@@ -195,19 +195,37 @@ public static Frame new_Frame (final Composite parent) {
 	Shell shell = parent.getShell ();
 	shell.addListener (SWT.Deiconify, shellListener);
 	shell.addListener (SWT.Iconify, shellListener);
-	parent.addListener (SWT.Dispose, new Listener () {
-		public void handleEvent (Event event) {
-			Shell shell = parent.getShell ();
-			shell.removeListener (SWT.Deiconify, shellListener);
-			shell.removeListener (SWT.Iconify, shellListener);
-			parent.setVisible(false);
-			EventQueue.invokeLater(new Runnable () {
-				public void run () {
-					frame.dispose ();
-				}
-			});
+	
+	Listener listener = new Listener () {
+		public void handleEvent (Event e) {
+			switch (e.type) {
+				case SWT.Dispose:
+					Shell shell = parent.getShell ();
+					shell.removeListener (SWT.Deiconify, shellListener);
+					shell.removeListener (SWT.Iconify, shellListener);
+					parent.setVisible(false);
+					EventQueue.invokeLater(new Runnable () {
+						public void run () {
+							frame.dispose ();
+						}
+					});
+					break;
+				case SWT.Resize:
+					if (Library.JAVA_VERSION >= Library.JAVA_VERSION(1, 6, 0)) {
+						final Rectangle clientArea = parent.getClientArea();
+						EventQueue.invokeLater(new Runnable () {
+							public void run () {
+								frame.setSize (clientArea.width, clientArea.height);
+							}
+						});
+					}
+					break;
+			}
 		}
-	});
+	};
+	parent.addListener (SWT.Dispose, listener);
+	parent.addListener (SWT.Resize, listener);
+	
 	parent.getDisplay().asyncExec(new Runnable() {
 		public void run () {
 			if (parent.isDisposed()) return;