add global NSLayoutManager instance

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index dbaa1ece9fabd9af8f38d8b67919f8c11f612ed3..998705a26458af2724da6decbda9c1520e86be61 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -417,6 +417,8 @@ const short kwxCursorLast = kwxCursorWatch;
 
 extern ClassicCursor gMacCursors[];
 
 
 extern ClassicCursor gMacCursors[];
 

+extern NSLayoutManager* gNSLayoutManager;
+

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 9a7d446ff8e30746288fdbc5629790d78b07053d..ef5aefa5389935a5b34e5903464fa54e25ad5c6d 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -261,6 +261,9 @@ void wxBell()
 
 wxNSAppController* appcontroller = nil;
 
 
 wxNSAppController* appcontroller = nil;
 

+NSLayoutManager* gNSLayoutManager = nil;
+
+

 bool wxApp::DoInitGui()
 {
     wxMacAutoreleasePool pool;
 bool wxApp::DoInitGui()
 {
     wxMacAutoreleasePool pool;


@@ -278,6 +281,8 @@ bool wxApp::DoInitGui()
         [NSApp finishLaunching];
 #endif
     }
         [NSApp finishLaunching];
 #endif
     }

+    gNSLayoutManager = [[NSLayoutManager alloc] init];
+    

     return true;
 }
 
     return true;
 }
 


@@ -289,6 +294,11 @@ void wxApp::DoCleanUp()
         [appcontroller release];
         appcontroller = 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)