X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9df4fb452e785836de38712af84d209113b5af..e5dcae09e6c207688b41c8b744764d32b7b39a46:/src/osx/cocoa/utils.mm?ds=inline diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index 173df9c046..e8d122f171 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -11,14 +11,13 @@ #include "wx/wxprec.h" -#include "wx/wxprec.h" - #include "wx/utils.h" #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/app.h" #if wxUSE_GUI + #include "wx/dialog.h" #include "wx/toplevel.h" #include "wx/font.h" #endif @@ -46,42 +45,36 @@ void wxBell() NSBeep(); } -// ---------------------------------------------------------------------------- -// Common Event Support -// ---------------------------------------------------------------------------- - -void wxMacWakeUp() -{ - // TODO -} - #endif // wxUSE_BASE #if wxUSE_GUI -@interface wxNSAppController : NSObject +@interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER() { } -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender; +- (void)applicationWillFinishLaunching:(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; + withReplyEvent:(NSAppleEventDescriptor *)replyEvent; + +- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender; +- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender; +- (void)applicationWillTerminate:(NSApplication *)sender; @end @implementation wxNSAppController -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender -{ - // let wx do this, not cocoa - return NO; +- (void)applicationWillFinishLaunching:(NSApplication *)application { + wxUnusedVar(application); } - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename; { + wxUnusedVar(sender); wxCFStringRef cf(wxCFRetain(filename)); wxTheApp->MacOpenFile(cf.AsString()) ; return YES; @@ -89,17 +82,36 @@ void wxMacWakeUp() - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender; { + wxUnusedVar(sender); wxTheApp->MacNewFile() ; return NO; } - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename { + wxUnusedVar(sender); wxCFStringRef cf(wxCFRetain(filename)); wxTheApp->MacPrintFile(cf.AsString()) ; return YES; } +- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag +{ + wxUnusedVar(flag); + wxUnusedVar(sender); + wxTheApp->MacReopenApp() ; + return NO; +} + +- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event + withReplyEvent:(NSAppleEventDescriptor *)replyEvent +{ + wxUnusedVar(replyEvent); + NSString* url = [[event descriptorAtIndex:1] stringValue]; + wxCFStringRef cf(wxCFRetain(url)); + wxTheApp->MacOpenURL(cf.AsString()) ; +} + /* Allowable return values are: NSTerminateNow - it is ok to proceed with termination @@ -109,38 +121,34 @@ void wxMacWakeUp() */ - (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; + wxUnusedVar(sender); + wxCloseEvent event; + wxTheApp->OnQueryEndSession(event); + if ( event.GetVeto() ) + return NSTerminateCancel; + + return NSTerminateNow; } -- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag -{ - wxTheApp->MacReopenApp() ; - return NO; +- (void)applicationWillTerminate:(NSApplication *)application { + wxUnusedVar(application); + wxCloseEvent event; + event.SetCanVeto(false); + wxTheApp->OnEndSession(event); } -- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event - withReplyEvent:(NSAppleEventDescriptor *)replyEvent +- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender { - NSString* url = [[event descriptorAtIndex:1] stringValue]; - wxCFStringRef cf(wxCFRetain(url)); - wxTheApp->MacOpenURL(cf.AsString()) ; + wxUnusedVar(sender); + // let wx do this, not cocoa + return NO; } + @end -/* +/* allows ShowModal to work when using sheets. - see include/wx/osx/cocoa/private.h for more info + see include/wx/osx/cocoa/private.h for more info */ @implementation ModalDialogDelegate - (id)init @@ -148,10 +156,16 @@ void wxMacWakeUp() [super init]; sheetFinished = NO; resultCode = -1; + impl = 0; return self; } -- (BOOL)finished +- (void)setImplementation: (wxDialog *)dialog +{ + impl = dialog; +} + +- (BOOL)finished { return sheetFinished; } @@ -171,11 +185,15 @@ void wxMacWakeUp() - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { + wxUnusedVar(contextInfo); resultCode = returnCode; sheetFinished = YES; // NSAlerts don't need nor respond to orderOut if ([sheet respondsToSelector:@selector(orderOut:)]) [sheet orderOut: self]; + + if (impl) + impl->ModalFinishedCallback(sheet, returnCode); } @end @@ -187,13 +205,18 @@ bool wxApp::DoInitGui() if (!sm_isEmbedded) { wxNSAppController* controller = [[wxNSAppController alloc] init]; - [[NSApplication sharedApplication] setDelegate:controller]; + [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 + [NSApp finishLaunching]; +#endif } - [NSApp finishLaunching]; return true; } @@ -225,6 +248,34 @@ void wxGetMousePosition( int* x, int* y ) *y = pt.y; }; +#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 + +wxMouseState wxGetMouseState() +{ + wxMouseState ms; + + wxPoint pt = wxGetMousePosition(); + ms.SetX(pt.x); + ms.SetY(pt.y); + + NSUInteger modifiers = [NSEvent modifierFlags]; + NSUInteger buttons = [NSEvent pressedMouseButtons]; + + ms.SetLeftDown( (buttons & 0x01) != 0 ); + ms.SetMiddleDown( (buttons & 0x04) != 0 ); + ms.SetRightDown( (buttons & 0x02) != 0 ); + + ms.SetControlDown(modifiers & NSControlKeyMask); + ms.SetShiftDown(modifiers & NSShiftKeyMask); + ms.SetAltDown(modifiers & NSAlternateKeyMask); + ms.SetMetaDown(modifiers & NSCommandKeyMask); + + return ms; +} + + +#endif + wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) { return new wxOSXTimerImpl(timer); @@ -268,14 +319,6 @@ bool wxIsBusy() return (gs_wxBusyCursorCount > 0); } -void wxMacGlobalToLocal( WindowRef window , Point*pt ) -{ -} - -void wxMacLocalToGlobal( WindowRef window , Point*pt ) -{ -} - wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const { // wxScreenDC is derived from wxWindowDC, so a screen dc will @@ -298,14 +341,21 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain]; [view unlockFocus]; - CGImageRef cgImageRef = (CGImageRef)[rep CGImage]; + wxBitmap bitmap(width, height); + if ( [rep respondsToSelector:@selector(CGImage)] ) + { + 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; + 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; + } + else + { + // TODO for 10.4 in case we can support this for osx_cocoa + } [rep release]; return bitmap; @@ -313,4 +363,4 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const #endif // wxUSE_GUI -#endif // wxOSX_USE_COCOA \ No newline at end of file +#endif // wxOSX_USE_COCOA