X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88695e9ab8ca4e35ab92c0b8fcceb84cb65ffe1f..ddd7e4307b4a58a21e8a5eb04afe06e1fe65f7d8:/src/osx/cocoa/utils.mm diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index 81f1d186f8..4c35abe950 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: utils.mm 48805 2007-09-19 14:52:25Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,63 +45,17 @@ void wxBell() NSBeep(); } -// ---------------------------------------------------------------------------- -// Common Event Support -// ---------------------------------------------------------------------------- - -void wxMacWakeUp() -{ - // ensure that we have an auto release pool in place because the event will - // be autoreleased from NSEvent:otherEventWithType and we might not have a - // global pool during startup or shutdown and we actually never have it if - // we're called from another thread - // - // FIXME: we can't use wxMacAutoreleasePool here because it's in core and - // we're in base - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSEvent* wakeupEvent = [NSEvent otherEventWithType:NSApplicationDefined - location:NSZeroPoint - modifierFlags:NSAnyEventMask - timestamp:0 - windowNumber:0 - context:nil - subtype:0 - data1:0 - data2:0]; - [NSApp postEvent:wakeupEvent atStart:NO]; - - [pool release]; -} - #endif // wxUSE_BASE #if wxUSE_GUI -@interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER() -{ -} - -- (void)applicationWillFinishLaunching:(NSApplication *)sender; - -- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename; -- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender; -- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename; -- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event - withReplyEvent:(NSAppleEventDescriptor *)replyEvent; - -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender; -- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender; -- (void)applicationWillTerminate:(NSApplication *)sender; -@end - @implementation wxNSAppController -- (void)applicationWillFinishLaunching:(NSApplication *)application { +- (void)applicationWillFinishLaunching:(NSNotification *)application { wxUnusedVar(application); } -- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename; +- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename { wxUnusedVar(sender); wxCFStringRef cf(wxCFRetain(filename)); @@ -109,7 +63,7 @@ void wxMacWakeUp() return YES; } -- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender; +- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender { wxUnusedVar(sender); wxTheApp->MacNewFile() ; @@ -159,7 +113,7 @@ void wxMacWakeUp() return NSTerminateNow; } -- (void)applicationWillTerminate:(NSApplication *)application { +- (void)applicationWillTerminate:(NSNotification *)application { wxUnusedVar(application); wxCloseEvent event; event.SetCanVeto(false); @@ -173,6 +127,49 @@ void wxMacWakeUp() return NO; } +- (void)applicationDidBecomeActive:(NSNotification *)notification +{ + wxUnusedVar(notification); + + for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), + end = wxTopLevelWindows.end(); + i != end; + ++i ) + { + wxTopLevelWindow * const win = static_cast(*i); + wxNonOwnedWindowImpl* winimpl = win ? win->GetNonOwnedPeer() : NULL; + WXWindow nswindow = win ? win->GetWXWindow() : nil; + + if ( nswindow && [nswindow hidesOnDeactivate] == NO && winimpl) + winimpl->RestoreWindowLevel(); + } + if ( wxTheApp ) + wxTheApp->SetActive( true , NULL ) ; +} + +- (void)applicationWillResignActive:(NSNotification *)notification +{ + wxUnusedVar(notification); + for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), + end = wxTopLevelWindows.end(); + i != end; + ++i ) + { + wxTopLevelWindow * const win = static_cast(*i); + WXWindow nswindow = win ? win->GetWXWindow() : nil; + + if ( nswindow && [nswindow level] == kCGFloatingWindowLevel && [nswindow hidesOnDeactivate] == NO ) + [nswindow setLevel:kCGNormalWindowLevel]; + } +} + +- (void)applicationDidResignActive:(NSNotification *)notification +{ + wxUnusedVar(notification); + if ( wxTheApp ) + wxTheApp->SetActive( false , NULL ) ; +} + @end /* @@ -234,11 +231,17 @@ 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 } return true; } @@ -249,7 +252,7 @@ void wxApp::DoCleanUp() void wxClientDisplayRect(int *x, int *y, int *width, int *height) { - NSRect displayRect = [[NSScreen mainScreen] visibleFrame]; + NSRect displayRect = [wxOSXGetMenuScreen() visibleFrame]; wxRect r = wxFromNSRect( NULL, displayRect ); if ( x ) *x = r.x; @@ -313,6 +316,13 @@ void wxBeginBusyCursor(const wxCursor *cursor) { if (gs_wxBusyCursorCount++ == 0) { + NSEnumerator *enumerator = [[[NSApplication sharedApplication] windows] objectEnumerator]; + id object; + + while ((object = [enumerator nextObject])) { + [(NSWindow*) object disableCursorRects]; + } + gMacStoredActiveCursor = gMacCurrentCursor; cursor->MacInstall(); @@ -329,10 +339,17 @@ void wxEndBusyCursor() if (--gs_wxBusyCursorCount == 0) { - gMacStoredActiveCursor.MacInstall(); - gMacStoredActiveCursor = wxNullCursor; + NSEnumerator *enumerator = [[[NSApplication sharedApplication] windows] objectEnumerator]; + id object; + + while ((object = [enumerator nextObject])) { + [(NSWindow*) object enableCursorRects]; + } wxSetCursor(wxNullCursor); + + gMacStoredActiveCursor.MacInstall(); + gMacStoredActiveCursor = wxNullCursor; } } @@ -351,35 +368,35 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const 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]; - wxBitmap bitmap(width, height); - if ( [rep respondsToSelector:@selector(CGImage)] ) - { - CGImageRef cgImageRef = (CGImageRef)[rep CGImage]; - 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 + NSView* view = (NSView*) m_window->GetHandle(); + if ( [view isHiddenOrHasHiddenAncestor] == NO ) { - // TODO for 10.4 in case we can support this for osx_cocoa + [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]; + if ( [rep respondsToSelector:@selector(CGImage)] ) + { + CGImageRef cgImageRef = (CGImageRef)[rep CGImage]; + + 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]; } - [rep release]; return bitmap; }