Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 39d2287aa283461c546fe07264c228c08daa83f4..f4702bb185709205d8bbf845c25f1d62249cae30 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -4,21 +4,20 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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


@@ -38,7 +37,7 @@
 
 #if wxOSX_USE_COCOA
 
 
 #if wxOSX_USE_COCOA
 

-#if wxUSE_BASE
+#if wxUSE_GUI

 
 // Emit a beeeeeep
 void wxBell()
 
 // Emit a beeeeeep
 void wxBell()


@@ -46,58 +45,68 @@ void wxBell()
     NSBeep();
 }
 
     NSBeep();
 }
 

-// ----------------------------------------------------------------------------
-// Common Event Support
-// ----------------------------------------------------------------------------
+@implementation wxNSAppController

 
 

-void wxMacWakeUp()
-{
-    // TODO
+- (void)applicationWillFinishLaunching:(NSNotification *)application { 
+    wxUnusedVar(application);
+    
+    // we must install our handlers later than setting the app delegate, because otherwise our handlers
+    // get overwritten in the meantime
+
+    NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
+    
+    [appleEventManager setEventHandler:self andSelector:@selector(handleGetURLEvent:withReplyEvent:)
+                         forEventClass:kInternetEventClass andEventID:kAEGetURL];
+    
+    [appleEventManager setEventHandler:self andSelector:@selector(handleOpenAppEvent:withReplyEvent:)
+                         forEventClass:kCoreEventClass andEventID:kAEOpenApplication];
+    

 }
 
 }
 

-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
-@interface wxNSAppController : NSObject
+- (void)application:(NSApplication *)sender openFiles:(NSArray *)fileNames

 {
 {

-}
-
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
-- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
-- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
-- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename;
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
-- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
-    withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
-@end
-
-@implementation wxNSAppController
+    wxUnusedVar(sender);
+    wxArrayString fileList;
+    size_t i;
+    const size_t count = [fileNames count];
+    for (i = 0; i < count; i++)
+    {
+        fileList.Add( wxCFStringRef::AsStringWithNormalizationFormC([fileNames objectAtIndex:i]) );
+    }

 
 

-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
-{
-    // let wx do this, not cocoa
-    return NO;
+    wxTheApp->MacOpenFiles(fileList);

 }
 
 }
 

-- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
+- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename

 {
 {

+    wxUnusedVar(sender);

     wxCFStringRef cf(wxCFRetain(filename));
     wxCFStringRef cf(wxCFRetain(filename));

-    wxTheApp->MacOpenFile(cf.AsString()) ;
+    wxTheApp->MacPrintFile(cf.AsString()) ;

     return YES;
 }
 
     return YES;
 }
 

-- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag

 {
 {

-    wxTheApp->MacNewFile() ;
+    wxUnusedVar(flag);
+    wxUnusedVar(sender);
+    wxTheApp->MacReopenApp() ;

     return NO;
 }
 
     return NO;
 }
 

-- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
+- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
+           withReplyEvent:(NSAppleEventDescriptor *)replyEvent

 {
 {

-    wxCFStringRef cf(wxCFRetain(filename));
-    wxTheApp->MacPrintFile(cf.AsString()) ;
-    return YES;
+    wxUnusedVar(replyEvent);
+    NSString* url = [[event descriptorAtIndex:1] stringValue];
+    wxCFStringRef cf(wxCFRetain(url));
+    wxTheApp->MacOpenURL(cf.AsString()) ;
+}
+
+- (void)handleOpenAppEvent:(NSAppleEventDescriptor *)event
+           withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+{
+    wxUnusedVar(replyEvent);
+    wxTheApp->MacNewFile() ;

 }
 
 /*
 }
 
 /*


@@ -109,49 +118,94 @@ void wxMacWakeUp()
 */
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
 */
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {

-    wxWindow* win = wxTheApp->GetTopWindow() ;
-    if ( win )
-    {
-        wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macExitMenuItemId);
-        if (!win->GetEventHandler()->ProcessEvent(exitEvent))
-            win->Close(true) ;
-    }
-    else
+    wxUnusedVar(sender);
+    wxCloseEvent event;
+    wxTheApp->OnQueryEndSession(event);
+    if ( event.GetVeto() )
+        return NSTerminateCancel;
+    
+    return NSTerminateNow;
+}
+
+- (void)applicationWillTerminate:(NSNotification *)application {
+    wxUnusedVar(application);
+    wxCloseEvent event;
+    event.SetCanVeto(false);
+    wxTheApp->OnEndSession(event);
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
+{
+    wxUnusedVar(sender);
+    // let wx do this, not cocoa
+    return NO;
+}
+
+- (void)applicationDidBecomeActive:(NSNotification *)notification
+{
+    wxUnusedVar(notification);
+
+    for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
+         end = wxTopLevelWindows.end();
+         i != end;
+         ++i )

     {
     {

-         wxTheApp->ExitMainLoop() ;
+        wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
+        wxNonOwnedWindowImpl* winimpl = win ? win->GetNonOwnedPeer() : NULL;
+        WXWindow nswindow = win ? win->GetWXWindow() : nil;
+        
+        if ( nswindow && [nswindow hidesOnDeactivate] == NO && winimpl)
+            winimpl->RestoreWindowLevel();

     }
     }

-    return NSTerminateCancel;
+    if ( wxTheApp )
+        wxTheApp->SetActive( true , NULL ) ;

 }
 
 }
 

-- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
+- (void)applicationWillResignActive:(NSNotification *)notification

 {
 {

-    wxTheApp->MacReopenApp() ;
-    return NO;
+    wxUnusedVar(notification);
+    for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
+         end = wxTopLevelWindows.end();
+         i != end;
+         ++i )
+    {
+        wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
+        WXWindow nswindow = win ? win->GetWXWindow() : nil;
+        
+        if ( nswindow && [nswindow level] == kCGFloatingWindowLevel && [nswindow hidesOnDeactivate] == NO )
+            [nswindow setLevel:kCGNormalWindowLevel];
+    }

 }
 
 }
 

-- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
-    withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+- (void)applicationDidResignActive:(NSNotification *)notification

 {
 {

-    NSString* url = [[event descriptorAtIndex:1] stringValue];
-    wxCFStringRef cf(wxCFRetain(url));
-    wxTheApp->MacOpenURL(cf.AsString()) ;
+    wxUnusedVar(notification);
+    if ( wxTheApp )
+        wxTheApp->SetActive( false , NULL ) ;

 }
 }

+

 @end
 
 @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
 {

-    [super init];
+    self = [super init];

     sheetFinished = NO;
     resultCode = -1;
     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,36 +225,89 @@ 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;
     resultCode = returnCode;
     sheetFinished = YES;

-    [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
+
+// here we subclass NSApplication, for the purpose of being able to override sendEvent.
+@interface wxNSApplication : NSApplication
+{

 }
 }

+
+- (void)sendEvent:(NSEvent *)anEvent;
+
+@end
+
+@implementation wxNSApplication
+
+/* This is needed because otherwise we don't receive any key-up events for command-key
+ combinations (an AppKit bug, apparently)                      */
+- (void)sendEvent:(NSEvent *)anEvent
+{
+    if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask))
+        [[self keyWindow] sendEvent:anEvent];
+    else [super sendEvent:anEvent];
+}
+

 @end
 
 @end
 

+WX_NSObject appcontroller = nil;
+
+NSLayoutManager* gNSLayoutManager = nil;
+
+WX_NSObject wxApp::OSXCreateAppController()
+{
+    return [[wxNSAppController alloc] init];
+}
+

 bool wxApp::DoInitGui()
 {
 bool wxApp::DoInitGui()
 {

-    [NSApplication sharedApplication];
+    wxMacAutoreleasePool pool;

 
     if (!sm_isEmbedded)
     {
 
     if (!sm_isEmbedded)
     {

-        wxNSAppController* controller = [[wxNSAppController alloc] init];
-        [[NSApplication sharedApplication] setDelegate:controller];
+        [wxNSApplication sharedApplication];
+
+        appcontroller = OSXCreateAppController();
+        [NSApp setDelegate:appcontroller];

 
 

-        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

     }
     }

-    [NSApp finishLaunching];
+    gNSLayoutManager = [[NSLayoutManager alloc] init];
+    

     return true;
 }
 
 void wxApp::DoCleanUp()
 {
     return true;
 }
 
 void wxApp::DoCleanUp()
 {

+    if ( appcontroller != nil )
+    {
+        [NSApp setDelegate:nil];
+        [appcontroller release];
+        appcontroller = nil;
+    }
+    if ( gNSLayoutManager != nil )
+    {
+        [gNSLayoutManager release];
+        gNSLayoutManager = nil;
+    }

 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
 }
 
 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;
     wxRect r = wxFromNSRect( NULL, displayRect );
     if ( x )
         *x = r.x;


@@ -222,6 +329,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.SetRawControlDown(modifiers & NSControlKeyMask);
+    ms.SetShiftDown(modifiers & NSShiftKeyMask);
+    ms.SetAltDown(modifiers & NSAlternateKeyMask);
+    ms.SetControlDown(modifiers & NSCommandKeyMask);
+    
+    return ms;
+}
+
+
+#endif
+

 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxOSXTimerImpl(timer);
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxOSXTimerImpl(timer);


@@ -236,6 +371,13 @@ void wxBeginBusyCursor(const wxCursor *cursor)
 {
     if (gs_wxBusyCursorCount++ == 0)
     {
 {
     if (gs_wxBusyCursorCount++ == 0)
     {

+        NSEnumerator *enumerator = [[[NSApplication sharedApplication] windows] objectEnumerator];
+        id object;
+        
+        while ((object = [enumerator nextObject])) {
+            [(NSWindow*) object disableCursorRects];
+        }        
+

         gMacStoredActiveCursor = gMacCurrentCursor;
         cursor->MacInstall();
 
         gMacStoredActiveCursor = gMacCurrentCursor;
         cursor->MacInstall();
 


@@ -252,10 +394,17 @@ void wxEndBusyCursor()
 
     if (--gs_wxBusyCursorCount == 0)
     {
 
     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);
 
         wxSetCursor(wxNullCursor);

+
+        gMacStoredActiveCursor.MacInstall();
+        gMacStoredActiveCursor = wxNullCursor;

     }
 }
 
     }
 }
 


@@ -265,14 +414,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


@@ -282,32 +423,37 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
 
     wxSize sz = m_window->GetSize();
 
 
     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 ;
 
     int width = subrect != NULL ? subrect->width : sz.x;
     int height = subrect !=  NULL ? subrect->height : sz.y ;
 

-    NSRect rect = NSMakeRect(left, top, width, height );
+    wxBitmap bitmap(width, height);
+

     NSView* view = (NSView*) m_window->GetHandle();
     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];
-
-    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;
-    [rep release];
+    if ( [view isHiddenOrHasHiddenAncestor] == NO )
+    {
+        [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]];
+        [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 ) ;
+        }
+        else
+        {
+            // TODO for 10.4 in case we can support this for osx_cocoa
+        }
+        [rep release];
+    }

 
     return bitmap;
 }
 
 #endif // wxUSE_GUI
 
 
     return bitmap;
 }
 
 #endif // wxUSE_GUI
 

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