X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a0d7a989c5e58d434badd69a9bb16bde8dcd0c0..5146904d0fa8439dd7161313872cf86874087426:/src/osx/cocoa/utils.mm

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 225c9d487c..c2c8369940 100644
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -37,7 +37,7 @@
 
 #if wxOSX_USE_COCOA
 
-#if wxUSE_BASE
+#if wxUSE_GUI
 
 // Emit a beeeeeep
 void wxBell()
@@ -45,10 +45,6 @@ void wxBell()
     NSBeep();
 }
 
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
 @implementation wxNSAppController
 
 - (void)applicationWillFinishLaunching:(NSNotification *)application {	
@@ -241,6 +237,8 @@ void wxBell()
 }
 @end
 
+wxNSAppController* appcontroller = nil;
+
 bool wxApp::DoInitGui()
 {
     wxMacAutoreleasePool pool;
@@ -248,8 +246,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 +260,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)
@@ -305,10 +309,10 @@ wxMouseState wxGetMouseState()
     ms.SetMiddleDown( (buttons & 0x04) != 0 );
     ms.SetRightDown( (buttons & 0x02) != 0 );
     
-    ms.SetControlDown(modifiers & NSControlKeyMask);
+    ms.SetRawControlDown(modifiers & NSControlKeyMask);
     ms.SetShiftDown(modifiers & NSShiftKeyMask);
     ms.SetAltDown(modifiers & NSAlternateKeyMask);
-    ms.SetMetaDown(modifiers & NSCommandKeyMask);
+    ms.SetControlDown(modifiers & NSCommandKeyMask);
     
     return ms;
 }