]> git.saurik.com Git - wxWidgets.git/commitdiff
native apple event support for osx cocoa
authorStefan Csomor <csomor@advancedconcepts.ch>
Sat, 10 Jan 2009 18:44:38 +0000 (18:44 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Sat, 10 Jan 2009 18:44:38 +0000 (18:44 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/osx/carbon/app.h
src/osx/carbon/app.cpp
src/osx/cocoa/utils.mm

index 5f6321dc466c05e8fe4401c6d1e9bb29f7c53317..9bf7a402b7100946a70f37085b6ffeadbbc19589 100644 (file)
@@ -110,7 +110,7 @@ public:
     bool    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
     bool    MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
     void    MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ;
-#if wxOSX_USE_COCOA_OR_CARBON
+#if wxOSX_CARBON
     // we only have applescript on these
     virtual short         MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
     virtual short         MacHandleAEGURL(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
index be9227b5fb8cac6b8bd8674dcf81a84426d76a2a..cf770ff35059be6e83593d8bdfa18a2f5d83003f 100644 (file)
@@ -79,7 +79,7 @@ wxString  wxApp::s_macHelpMenuTitleName = wxT("&Help") ;
 
 bool      wxApp::sm_isEmbedded = false; // Normally we're not a plugin
 
-#if wxOSX_USE_COCOA_OR_CARBON
+#if wxOSX_CARBON
 
 //----------------------------------------------------------------------
 // Core Apple Event Support
index ab7f2f4cff67b3bae7a2b2adb4de392d94310afe..c60da586584be33019b619287824e495b91daea2 100644 (file)
@@ -59,9 +59,98 @@ void wxMacWakeUp()
  
 #if wxUSE_GUI
 
+@interface wxNSAppController : NSObject
+{
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
+- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
+- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
+- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename;
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
+- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
+    withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
+@end
+
+@implementation wxNSAppController
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
+{
+    // let wx do this, not cocoa
+    return NO;
+}
+
+- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
+{
+    wxCFStringRef cf(wxCFRetain(filename));
+    wxTheApp->MacOpenFile(cf.AsString()) ;
+    return YES;
+}
+
+- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
+{
+    wxTheApp->MacNewFile() ;
+    return NO;
+}
+
+- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
+{
+    wxCFStringRef cf(wxCFRetain(filename));
+    wxTheApp->MacPrintFile(cf.AsString()) ;
+    return YES;
+}
+
+/* 
+    Allowable return values are:
+        NSTerminateNow - it is ok to proceed with termination
+        NSTerminateCancel - the application should not be terminated
+        NSTerminateLater - it may be ok to proceed with termination later.  The application must call -replyToApplicationShouldTerminate: with YES or NO once the answer is known
+            this return value is for delegates who need to provide document modal alerts (sheets) in order to decide whether to quit.
+*/
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+{
+    wxWindow* win = wxTheApp->GetTopWindow() ;
+    if ( win )
+    {
+        wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macExitMenuItemId);
+        if (!win->ProcessEvent(exitEvent))
+            win->Close(true) ;
+    }
+    else
+    {
+         wxTheApp->ExitMainLoop() ;
+    }
+    return NSTerminateCancel;
+}
+
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
+{
+    wxTheApp->MacReopenApp() ;
+    return NO;
+}
+
+- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
+    withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+{
+    NSString* url = [[event descriptorAtIndex:1] stringValue];
+    wxCFStringRef cf(wxCFRetain(url));
+    wxTheApp->MacOpenURL(cf.AsString()) ;
+}
+@end
+
 bool wxApp::DoInitGui()
 {
     [NSApplication sharedApplication];
+
+    if (!sm_isEmbedded)
+    {
+        wxNSAppController* controller = [[wxNSAppController alloc] init];
+        [[NSApplication sharedApplication] setDelegate:controller];
+        
+        NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
+        [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
+            forEventClass:kInternetEventClass andEventID:kAEGetURL];
+    }
     [NSApp finishLaunching];
     return true;
 }