add global NSLayoutManager instance
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -417,6 +417,8 @@ const short kwxCursorLast = kwxCursorWatch;
|
||||
|
||||
extern ClassicCursor gMacCursors[];
|
||||
|
||||
extern NSLayoutManager* gNSLayoutManager;
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@@ -261,6 +261,9 @@ void wxBell()
|
||||
|
||||
wxNSAppController* appcontroller = nil;
|
||||
|
||||
NSLayoutManager* gNSLayoutManager = nil;
|
||||
|
||||
|
||||
bool wxApp::DoInitGui()
|
||||
{
|
||||
wxMacAutoreleasePool pool;
|
||||
@@ -278,6 +281,8 @@ bool wxApp::DoInitGui()
|
||||
[NSApp finishLaunching];
|
||||
#endif
|
||||
}
|
||||
gNSLayoutManager = [[NSLayoutManager alloc] init];
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -289,6 +294,11 @@ void wxApp::DoCleanUp()
|
||||
[appcontroller release];
|
||||
appcontroller = nil;
|
||||
}
|
||||
if ( gNSLayoutManager != nil )
|
||||
{
|
||||
[gNSLayoutManager release];
|
||||
gNSLayoutManager = nil;
|
||||
}
|
||||
}
|
||||
|
||||
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
|
||||
|
Reference in New Issue
Block a user