fixing multiple extensions in one filter, turning off temporarily sheets code

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

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index a9cdfeff837872c7d2cd1641dc311c512d832946..a33ccd109880fb2c9099891121037f3fc5a15228 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/cocoa/utils.mm
+// Name:        src/osx/cocoa/utils.mm

 // Purpose:     various cocoa utility functions
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     various cocoa utility functions
 // Author:      Stefan Csomor
 // Modified by:


@@ -31,6 +31,7 @@
 #if wxUSE_GUI
 #if wxOSX_USE_COCOA_OR_CARBON
     #include <CoreServices/CoreServices.h>
 #if wxUSE_GUI
 #if wxOSX_USE_COCOA_OR_CARBON
     #include <CoreServices/CoreServices.h>

+    #include "wx/osx/dcclient.h"

     #include "wx/osx/private/timer.h"
 #endif
 #endif // wxUSE_GUI
     #include "wx/osx/private/timer.h"
 #endif
 #endif // wxUSE_GUI


@@ -55,11 +56,144 @@ void wxMacWakeUp()
 }
 
 #endif // wxUSE_BASE
 }
 
 #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
+
+/* 
+    allows ShowModal to work when using sheets.
+    see include/wx/osx/cocoa/private.h for more info 
+*/
+@implementation ModalDialogDelegate
+- (id)init
+{
+    [super init];
+    sheetFinished = NO;
+    resultCode = -1;
+    return self;
+}
+
+- (BOOL)finished 
+{
+    return sheetFinished;
+}
+
+- (int)code
+{
+    return resultCode;
+}
+
+- (void)waitForSheetToFinish
+{
+    while (!sheetFinished)
+    {
+        wxSafeYield();
+    }
+}
+
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+    resultCode = returnCode;
+    sheetFinished = YES;
+    // NSAlerts don't need nor respond to orderOut
+    if ([sheet respondsToSelector:@selector(orderOut:)])
+        [sheet orderOut: self];
+}
+@end
+

 bool wxApp::DoInitGui()
 {
 bool wxApp::DoInitGui()
 {

+    wxMacAutoreleasePool pool;

     [NSApplication sharedApplication];
     [NSApplication sharedApplication];

-    [NSApp finishLaunching];
+
+    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;
 }
 
     return true;
 }
 


@@ -67,8 +201,6 @@ void wxApp::DoCleanUp()
 {
 }
 
 {
 }
 

-#if wxUSE_GUI
-

 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
     NSRect displayRect = [[NSScreen mainScreen] visibleFrame];
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
     NSRect displayRect = [[NSScreen mainScreen] visibleFrame];


@@ -81,12 +213,16 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *width = r.GetWidth();
     if ( height )
         *height = r.GetHeight();
         *width = r.GetWidth();
     if ( height )
         *height = r.GetHeight();

-    
+

 }
 
 void wxGetMousePosition( int* x, int* y )
 {
     wxPoint pt = wxFromNSPoint(NULL, [NSEvent mouseLocation]);
 }
 
 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)
 };
 
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)


@@ -140,8 +276,41 @@ void wxMacLocalToGlobal( WindowRef window , Point*pt )
 {
 }
 
 {
 }
 

-#endif // wxUSE_GUI
+wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
+{
+    // wxScreenDC is derived from wxWindowDC, so a screen dc will
+    // 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
+    // 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 = (CGImageRef)[rep CGImage];

 
 

+    wxBitmap bitmap(CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
+    CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
+    // since our context is upside down we dont use CGContextDrawImage
+    wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ;
+    CGImageRelease(cgImageRef);
+    cgImageRef = NULL;
+    [rep release];
+
+    return bitmap;
+}
+
+#endif // wxUSE_GUI

 
 #endif // wxOSX_USE_COCOA
\ No newline at end of file
 
 #endif // wxOSX_USE_COCOA
\ No newline at end of file