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 173df9c046c06a9a76fb1afeac80222c8823f8dc..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


@@ -52,14 +51,34 @@ void wxBell()
 
 void wxMacWakeUp()
 {
 
 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
 
 }
 
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 

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

 {
 }
 
 {
 }
 


@@ -76,12 +95,14 @@ void wxMacWakeUp()
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 {
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 {

+    wxUnusedVar(sender);

     // let wx do this, not cocoa
     return NO;
 }
 
 - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
 {
     // 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;
     wxCFStringRef cf(wxCFRetain(filename));
     wxTheApp->MacOpenFile(cf.AsString()) ;
     return YES;


@@ -89,12 +110,14 @@ void wxMacWakeUp()
 
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
 {
 
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
 {

+    wxUnusedVar(sender);

     wxTheApp->MacNewFile() ;
     return NO;
 }
 
 - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
 {
     wxTheApp->MacNewFile() ;
     return NO;
 }
 
 - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
 {

+    wxUnusedVar(sender);

     wxCFStringRef cf(wxCFRetain(filename));
     wxTheApp->MacPrintFile(cf.AsString()) ;
     return YES;
     wxCFStringRef cf(wxCFRetain(filename));
     wxTheApp->MacPrintFile(cf.AsString()) ;
     return YES;


@@ -109,6 +132,7 @@ void wxMacWakeUp()
 */
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
 */
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {

+    wxUnusedVar(sender);

     wxWindow* win = wxTheApp->GetTopWindow() ;
     if ( win )
     {
     wxWindow* win = wxTheApp->GetTopWindow() ;
     if ( win )
     {


@@ -125,6 +149,8 @@ void wxMacWakeUp()
 
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
 {
 
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
 {

+    wxUnusedVar(flag);
+    wxUnusedVar(sender);

     wxTheApp->MacReopenApp() ;
     return NO;
 }
     wxTheApp->MacReopenApp() ;
     return NO;
 }


@@ -132,15 +158,16 @@ void wxMacWakeUp()
 - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
     withReplyEvent:(NSAppleEventDescriptor *)replyEvent
 {
 - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
     withReplyEvent:(NSAppleEventDescriptor *)replyEvent
 {

+    wxUnusedVar(replyEvent);

     NSString* url = [[event descriptorAtIndex:1] stringValue];
     wxCFStringRef cf(wxCFRetain(url));
     wxTheApp->MacOpenURL(cf.AsString()) ;
 }
 @end
 
     NSString* url = [[event descriptorAtIndex:1] stringValue];
     wxCFStringRef cf(wxCFRetain(url));
     wxTheApp->MacOpenURL(cf.AsString()) ;
 }
 @end
 

-/* 
+/*

     allows ShowModal to work when using sheets.
     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
 */
 @implementation ModalDialogDelegate
 - (id)init


@@ -148,10 +175,16 @@ void wxMacWakeUp()
     [super init];
     sheetFinished = NO;
     resultCode = -1;
     [super init];
     sheetFinished = NO;
     resultCode = -1;

+    impl = 0;

     return self;
 }
 
     return self;
 }
 

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

 {
     return sheetFinished;
 }
 {
     return sheetFinished;
 }


@@ -171,11 +204,15 @@ void wxMacWakeUp()
 
 - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
 {
 
 - (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];
     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
 
 }
 @end
 


@@ -192,8 +229,8 @@ bool wxApp::DoInitGui()
         NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
         [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
             forEventClass:kInternetEventClass andEventID:kAEGetURL];
         NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
         [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
             forEventClass:kInternetEventClass andEventID:kAEGetURL];

+        [NSApp finishLaunching];

     }
     }

-    [NSApp finishLaunching];

     return true;
 }
 
     return true;
 }
 


@@ -225,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);


@@ -268,14 +333,6 @@ bool wxIsBusy()
     return (gs_wxBusyCursorCount > 0);
 }
 
     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
 wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
 {
     // wxScreenDC is derived from wxWindowDC, so a screen dc will


@@ -298,14 +355,21 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
     [view unlockFocus];
 
     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;
     [rep release];
 
     return bitmap;


@@ -313,4 +377,4 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

-#endif // wxOSX_USE_COCOA
\ No newline at end of file
+#endif // wxOSX_USE_COCOA