From e1875c7859f8cd788b263b9640c281bce7b4353a Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 14 Jun 2012 21:40:12 +0000 Subject: [PATCH] fixing analyzer warning git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/utils.mm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index ac0909b64d..4a4c1e0c33 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -241,6 +241,8 @@ void wxBell() } @end +wxNSAppController* appcontroller = nil; + bool wxApp::DoInitGui() { wxMacAutoreleasePool pool; @@ -248,8 +250,8 @@ bool wxApp::DoInitGui() if (!sm_isEmbedded) { - 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 @@ -262,6 +264,12 @@ bool wxApp::DoInitGui() void wxApp::DoCleanUp() { + if ( appcontroller != nil ) + { + [NSApp setDelegate:nil]; + [appcontroller release]; + appcontroller = nil; + } } void wxClientDisplayRect(int *x, int *y, int *width, int *height) -- 2.47.2