removing 10.4 code, adding webkit trick for showing dynamic tooltips

[wxWidgets.git] / src / osx / cocoa / utils.mm

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index cb71db77a3ddf87f4c6620d97abec03cebb9a968..ac0909b64db749df1aae6c72f903bd6e3ca0994a 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -53,6 +53,18 @@ void wxBell()
 
 - (void)applicationWillFinishLaunching:(NSNotification *)application { 
     wxUnusedVar(application);
 
 - (void)applicationWillFinishLaunching:(NSNotification *)application { 
     wxUnusedVar(application);

+    
+    // we must install our handlers later than setting the app delegate, because otherwise our handlers
+    // get overwritten in the meantime
+
+    NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
+    
+    [appleEventManager setEventHandler:self andSelector:@selector(handleGetURLEvent:withReplyEvent:)
+                         forEventClass:kInternetEventClass andEventID:kAEGetURL];
+    
+    [appleEventManager setEventHandler:self andSelector:@selector(handleOpenAppEvent:withReplyEvent:)
+                         forEventClass:kCoreEventClass andEventID:kAEOpenApplication];
+    

 }
 
 - (void)application:(NSApplication *)sender openFiles:(NSArray *)fileNames
 }
 
 - (void)application:(NSApplication *)sender openFiles:(NSArray *)fileNames


@@ -69,13 +81,6 @@ void wxBell()
     wxTheApp->MacOpenFiles(fileList);
 }
 
     wxTheApp->MacOpenFiles(fileList);
 }
 

-- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender
-{
-    wxUnusedVar(sender);
-    wxTheApp->MacNewFile() ;
-    return NO;
-}
-

 - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
 {
     wxUnusedVar(sender);
 - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
 {
     wxUnusedVar(sender);


@@ -101,6 +106,13 @@ void wxBell()
     wxTheApp->MacOpenURL(cf.AsString()) ;
 }
 
     wxTheApp->MacOpenURL(cf.AsString()) ;
 }
 

+- (void)handleOpenAppEvent:(NSAppleEventDescriptor *)event
+           withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+{
+    wxUnusedVar(replyEvent);
+    wxTheApp->MacNewFile() ;
+}
+

 /*
     Allowable return values are:
         NSTerminateNow - it is ok to proceed with termination
 /*
     Allowable return values are:
         NSTerminateNow - it is ok to proceed with termination


@@ -239,10 +251,6 @@ bool wxApp::DoInitGui()
         wxNSAppController* controller = [[wxNSAppController alloc] init];
         [NSApp setDelegate:controller];
 
         wxNSAppController* controller = [[wxNSAppController alloc] init];
         [NSApp setDelegate:controller];
 

-        NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
-        [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
-            forEventClass:kInternetEventClass andEventID:kAEGetURL];
-   

         // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads
         // to the duplication of menus under 10.5 and a warning under 10.6
 #if 0
         // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads
         // to the duplication of menus under 10.5 and a warning under 10.6
 #if 0


@@ -297,10 +305,10 @@ wxMouseState wxGetMouseState()
     ms.SetMiddleDown( (buttons & 0x04) != 0 );
     ms.SetRightDown( (buttons & 0x02) != 0 );
     
     ms.SetMiddleDown( (buttons & 0x04) != 0 );
     ms.SetRightDown( (buttons & 0x02) != 0 );
     

-    ms.SetControlDown(modifiers & NSControlKeyMask);
+    ms.SetRawControlDown(modifiers & NSControlKeyMask);

     ms.SetShiftDown(modifiers & NSShiftKeyMask);
     ms.SetAltDown(modifiers & NSAlternateKeyMask);
     ms.SetShiftDown(modifiers & NSShiftKeyMask);
     ms.SetAltDown(modifiers & NSAlternateKeyMask);

-    ms.SetMetaDown(modifiers & NSCommandKeyMask);
+    ms.SetControlDown(modifiers & NSCommandKeyMask);

     
     return ms;
 }
     
     return ms;
 }