|
 |
fe57a4f |
diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
|
|
|
fe57a4f |
--- azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx 2009-10-30 01:16:06.000000000 +0200
|
|
|
fe57a4f |
+++ azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java 2009-11-19 21:24:45.000000000 +0200
|
|
|
fe57a4f |
@@ -175,57 +175,6 @@ public class SWTThread {
|
|
|
1b03bb3 |
}
|
|
|
1b03bb3 |
});
|
|
|
fe57a4f |
|
|
|
fe57a4f |
- if (Constants.isOSX) {
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- // On Cocoa, we get a Close trigger on display. Need to check if all
|
|
|
fe57a4f |
- // platforms send this.
|
|
|
fe57a4f |
- display.addListener(SWT.Close, new Listener() {
|
|
|
fe57a4f |
- public void handleEvent(Event event) {
|
|
|
fe57a4f |
- event.doit = UIFunctionsManager.getUIFunctions().dispose(false, false);
|
|
|
fe57a4f |
- }
|
|
|
fe57a4f |
- });
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- String platform = SWT.getPlatform();
|
|
|
fe57a4f |
- // use reflection here so we decouple generic SWT from OSX specific stuff to an extent
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- if (platform.equals("carbon")) {
|
|
|
fe57a4f |
- try {
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- Class ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- Constructor constructor = ehancerClass.getConstructor(new Class[] {});
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- constructor.newInstance(new Object[] {});
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- } catch (Throwable e) {
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- Debug.printStackTrace(e);
|
|
|
fe57a4f |
- }
|
|
|
fe57a4f |
- } else if (platform.equals("cocoa")) {
|
|
|
fe57a4f |
- try {
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- Class ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CocoaUIEnhancer");
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- Method mGetInstance = ehancerClass.getMethod("getInstance", new Class[0]);
|
|
|
fe57a4f |
- Object claObj = mGetInstance.invoke(null, new Object[0] );
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- Method mHookAppMenu = claObj.getClass().getMethod("hookApplicationMenu", new Class[] {});
|
|
|
fe57a4f |
- if (mHookAppMenu != null) {
|
|
|
fe57a4f |
- mHookAppMenu.invoke(claObj, new Object[0]);
|
|
|
fe57a4f |
- }
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- Method mHookDocOpen = claObj.getClass().getMethod("hookDocumentOpen", new Class[] {});
|
|
|
fe57a4f |
- if (mHookDocOpen != null) {
|
|
|
fe57a4f |
- mHookDocOpen.invoke(claObj, new Object[0]);
|
|
|
fe57a4f |
- }
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- } catch (Throwable e) {
|
|
|
fe57a4f |
-
|
|
|
fe57a4f |
- Debug.printStackTrace(e);
|
|
|
fe57a4f |
- }
|
|
|
fe57a4f |
- }
|
|
|
fe57a4f |
- }
|
|
|
1b03bb3 |
-
|
|
|
1b03bb3 |
if (app != null) {
|
|
|
1b03bb3 |
app.runInSWTThread();
|
|
|
1b03bb3 |
runner = new Thread(new AERunnable() {
|