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 8b80a601b125bef1514d9d309fbb1a98023b3b8f..f4702bb185709205d8bbf845c25f1d62249cae30 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -259,10 +259,14 @@ void wxBell()
 
 @end
 
 
 @end
 

-wxNSAppController* appcontroller = nil;
+WX_NSObject appcontroller = nil;

 
 NSLayoutManager* gNSLayoutManager = nil;
 
 
 NSLayoutManager* gNSLayoutManager = nil;
 

+WX_NSObject wxApp::OSXCreateAppController()
+{
+    return [[wxNSAppController alloc] init];
+}

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


@@ -272,7 +276,7 @@ bool wxApp::DoInitGui()
     {
         [wxNSApplication sharedApplication];
 
     {
         [wxNSApplication sharedApplication];
 

-        appcontroller = [[wxNSAppController alloc] init];
+        appcontroller = OSXCreateAppController();

         [NSApp setDelegate:appcontroller];
 
         // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads
         [NSApp setDelegate:appcontroller];
 
         // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads