Add sanity check on the item number.

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

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 8d74b22883bea2e67eeb82301d8593aaa3fb5176..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/wxprec.h"
-

 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
     #if wxUSE_GUI
 #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
         #include "wx/toplevel.h"
         #include "wx/font.h"
     #endif


@@ -79,7 +78,7 @@ void wxMacWakeUp()
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-@interface wxNSAppController : NSObject
+@interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER(<NSApplicationDelegate>)

 {
 }
 
 {
 }
 


@@ -176,9 +175,15 @@ void wxMacWakeUp()
     [super init];
     sheetFinished = NO;
     resultCode = -1;
     [super init];
     sheetFinished = NO;
     resultCode = -1;

+    impl = 0;

     return self;
 }
 
     return self;
 }
 

+- (void)setImplementation: (wxDialog *)dialog
+{
+    impl = dialog;
+}
+

 - (BOOL)finished
 {
     return sheetFinished;
 - (BOOL)finished
 {
     return sheetFinished;


@@ -205,6 +210,9 @@ void wxMacWakeUp()
     // NSAlerts don't need nor respond to orderOut
     if ([sheet respondsToSelector:@selector(orderOut:)])
         [sheet orderOut: self];
     // NSAlerts don't need nor respond to orderOut
     if ([sheet respondsToSelector:@selector(orderOut:)])
         [sheet orderOut: self];

+        
+    if (impl)
+        impl->ModalFinishedCallback(sheet, returnCode);

 }
 @end
 
 }
 @end
 


@@ -254,6 +262,34 @@ void wxGetMousePosition( int* x, int* y )
         *y = pt.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);
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxOSXTimerImpl(timer);