Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing analyzer warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-06-14 21:40:12 +00:00
parent ecbbb06b3b
commit e1875c7859
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osx/cocoa/utils.mm
View File

@@ -241,6 +241,8 @@ void wxBell()
} }
@end @end
wxNSAppController* appcontroller = nil;
bool wxApp::DoInitGui() bool wxApp::DoInitGui()
{ {
wxMacAutoreleasePool pool; wxMacAutoreleasePool pool;
@@ -248,8 +250,8 @@ bool wxApp::DoInitGui()
if (!sm_isEmbedded) if (!sm_isEmbedded)
{ {
wxNSAppController* controller = [[wxNSAppController alloc] init]; appcontroller = [[wxNSAppController alloc] init];
[NSApp setDelegate:controller]; [NSApp setDelegate:appcontroller];
// calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads // 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 // to the duplication of menus under 10.5 and a warning under 10.6
@@ -262,6 +264,12 @@ bool wxApp::DoInitGui()
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)