git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71763
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
+wxNSAppController* appcontroller = nil;
+
bool wxApp::DoInitGui()
{
wxMacAutoreleasePool pool;
bool wxApp::DoInitGui()
{
wxMacAutoreleasePool pool;
- wxNSAppController* controller = [[wxNSAppController alloc] init];
- [NSApp setDelegate:controller];
+ appcontroller = [[wxNSAppController alloc] init];
+ [NSApp setDelegate:appcontroller];
// 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
// 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
void wxApp::DoCleanUp()
{
void wxApp::DoCleanUp()
{
+ if ( appcontroller != nil )
+ {
+ [NSApp setDelegate:nil];
+ [appcontroller release];
+ appcontroller = nil;
+ }
}
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
}
void wxClientDisplayRect(int *x, int *y, int *width, int *height)