safe degradation

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

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 4b22268b3ff215ba75faa8d8548b48e7d0e6a0cf..53abbfcf5761ba1668b7daf3ec3056727de0e770 100644 (file)
--- 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,16 +51,34 @@ void wxBell()
 
 void wxMacWakeUp()
 {
-       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];
+    // 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(<NSApplicationDelegate>)
 {
 }
 
@@ -158,9 +175,15 @@ void wxMacWakeUp()
     [super init];
     sheetFinished = NO;
     resultCode = -1;
+    impl = 0;
     return self;
 }
 
+- (void)setImplementation: (wxDialog *)dialog
+{
+    impl = dialog;
+}
+
 - (BOOL)finished
 {
     return sheetFinished;
@@ -187,6 +210,9 @@ void wxMacWakeUp()
     // NSAlerts don't need nor respond to orderOut
     if ([sheet respondsToSelector:@selector(orderOut:)])
         [sheet orderOut: self];
+        
+    if (impl)
+        impl->ModalFinishedCallback(sheet, returnCode);
 }
 @end
 
@@ -236,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);
@@ -323,4 +377,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