Fix typo (sorry, thought I compiled before committing.)

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

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index d2374b6b8c12c1ead718ac5b9d0947f53d22b477..48bc5c9a96732c2ff631ea075b5bb4ee4e22dc50 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -56,12 +56,101 @@ void wxMacWakeUp()
 }
 
 #endif // wxUSE_BASE
- 
+
 #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->GetEventHandler()->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;
 }
@@ -82,12 +171,16 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *width = r.GetWidth();
     if ( height )
         *height = r.GetHeight();
-    
+
 }
 
 void wxGetMousePosition( int* x, int* y )
 {
     wxPoint pt = wxFromNSPoint(NULL, [NSEvent mouseLocation]);
+    if ( x )
+        *x = pt.x;
+    if ( y )
+        *y = pt.y;
 };
 
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
@@ -147,23 +240,23 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     // call this method when a Blit is performed with it as a source.
     if (!m_window)
         return wxNullBitmap;
-        
+
     wxSize sz = m_window->GetSize();
-    
+
     int left = subrect != NULL ? subrect->x : 0 ;
     int top = subrect != NULL ? subrect->y : 0 ;
     int width = subrect != NULL ? subrect->width : sz.x;
     int height = subrect !=  NULL ? subrect->height : sz.y ;
-    
+
     NSRect rect = NSMakeRect(left, top, width, height );
     NSView* view = (NSView*) m_window->GetHandle();
     [view lockFocus];
-    // we use this method as other methods force a repaint, and this method can be 
+    // we use this method as other methods force a repaint, and this method can be
     // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow)
     NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
     [view unlockFocus];
-    
-    CGImageRef cgImageRef = [rep CGImage]; 
+
+    CGImageRef cgImageRef = (CGImageRef)[rep CGImage];
 
     wxBitmap bitmap(CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
     CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
@@ -172,12 +265,10 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     CGImageRelease(cgImageRef);
     cgImageRef = NULL;
     [rep release];
-        
+
     return bitmap;
 }
 
 #endif // wxUSE_GUI
 
-
-
 #endif // wxOSX_USE_COCOA
\ No newline at end of file