cishell-svn

[CIShell-SVN] SF.net SVN: cishell: [350] trunk/clients/gui/org.cishell.reference.gui. menumanager/src/org/cishell/reference/gui/menumanager/Activator.java

[<bh...@us...>]

Revision: 350
          http://svn.sourceforge.net/cishell/?rev=350&view=rev
Author:   bh2
Date:     2006-12-15 08:28:26 -0800 (Fri, 15 Dec 2006)

Log Message:
-----------
Committing fix to allow Swing/AWT based algorithms (visualizations) to work on Mac OSX

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java

Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java	2006-12-11 20:29:25 UTC (rev 349)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java	2006-12-15 16:28:26 UTC (rev 350)
@@ -5,9 +5,12 @@
 import org.cishell.reference.gui.menumanager.menu.MenuAdapter;
 import org.cishell.reference.gui.workspace.CIShellApplication;
 import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.awt.SWT_AWT;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IStartup;
 import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -48,11 +51,22 @@
             windows = getWorkbench().getWorkbenchWindows();
         }
         
-        Shell shell = windows[0].getShell();
+        final Shell shell = windows[0].getShell();
         IMenuManager menuManager = CIShellApplication.getMenuManager();
         CIShellContext ciContext = new LocalCIShellContext(context);
         
         menuAdapter = new MenuAdapter(menuManager,shell,context,ciContext);
+        
+        try {
+        	//Fix to make swing based algorithms work on Macs
+	    	shell.getDisplay().syncExec(new Runnable(){
+				public void run() {
+					//This will simply initialize the SWT_AWT compatibility mode
+					SWT_AWT.new_Frame(new Shell(SWT.EMBEDDED));
+				}});
+        } catch (Exception e) {
+        	e.printStackTrace();
+        }
 	}
 
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [384] trunk/clients/gui/org.cishell.reference.gui. menumanager/src/org/cishell/reference/gui/menumanager/Activator.java

[<hu...@us...>]

Revision: 384
          http://svn.sourceforge.net/cishell/?rev=384&view=rev
Author:   huangb
Date:     2007-04-25 21:50:11 -0700 (Wed, 25 Apr 2007)

Log Message:
-----------
pass IWorkbenchWindow object to MenuAdapter

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java

Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java	2007-04-26 04:47:41 UTC (rev 383)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java	2007-04-26 04:50:11 UTC (rev 384)
@@ -10,7 +10,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IStartup;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -55,7 +54,7 @@
         IMenuManager menuManager = CIShellApplication.getMenuManager();
         CIShellContext ciContext = new LocalCIShellContext(context);
         
-        menuAdapter = new MenuAdapter(menuManager,shell,context,ciContext);
+        menuAdapter = new MenuAdapter(menuManager,shell,context,ciContext, windows[0]);
         
         try {
         	//Fix to make swing based algorithms work on Macs


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.