X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54f11060867c4c97ebbe7954353f5c311262fc4b..a533f0504f8067182cad0c26cbba7074248c8c37:/src/osx/cocoa/utils.mm diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index 2bd4e81428..53abbfcf57 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 @@ -52,14 +51,34 @@ void wxBell() void wxMacWakeUp() { - // TODO + // 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 +@interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER() { } @@ -76,12 +95,14 @@ void wxMacWakeUp() - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender { + wxUnusedVar(sender); // let wx do this, not cocoa return NO; } - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename; { + wxUnusedVar(sender); wxCFStringRef cf(wxCFRetain(filename)); wxTheApp->MacOpenFile(cf.AsString()) ; return YES; @@ -89,18 +110,20 @@ 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; } -/* +/* Allowable return values are: NSTerminateNow - it is ok to proceed with termination NSTerminateCancel - the application should not be terminated @@ -109,11 +132,12 @@ void wxMacWakeUp() */ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender { + wxUnusedVar(sender); wxWindow* win = wxTheApp->GetTopWindow() ; if ( win ) { wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macExitMenuItemId); - if (!win->ProcessEvent(exitEvent)) + if (!win->GetEventHandler()->ProcessEvent(exitEvent)) win->Close(true) ; } else @@ -125,6 +149,8 @@ void wxMacWakeUp() - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag { + wxUnusedVar(flag); + wxUnusedVar(sender); wxTheApp->MacReopenApp() ; return NO; } @@ -132,26 +158,79 @@ void wxMacWakeUp() - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent { + wxUnusedVar(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; + impl = 0; + return self; +} + +- (void)setImplementation: (wxDialog *)dialog +{ + impl = dialog; +} + +- (BOOL)finished +{ + return sheetFinished; +} + +- (int)code +{ + return resultCode; +} + +- (void)waitForSheetToFinish +{ + while (!sheetFinished) + { + wxSafeYield(); + } +} + +- (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 + bool wxApp::DoInitGui() { + wxMacAutoreleasePool pool; [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]; } - [NSApp finishLaunching]; return true; } @@ -171,7 +250,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height) *width = r.GetWidth(); if ( height ) *height = r.GetHeight(); - + } void wxGetMousePosition( int* x, int* y ) @@ -183,6 +262,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); @@ -226,49 +333,48 @@ 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 // 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 = (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; + + 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 + { + // TODO for 10.4 in case we can support this for osx_cocoa + } [rep release]; - + return bitmap; } #endif // wxUSE_GUI -#endif // wxOSX_USE_COCOA \ No newline at end of file +#endif // wxOSX_USE_COCOA