native drop target method for cocoa

[wxWidgets.git] / src / osx / cocoa / utils.mm

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 9f57601f8487afe7772829274d1ca7e9b089def4..c2c83699409aa287543ee586abb6648b2ef50007 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -37,7 +37,7 @@
 
 #if wxOSX_USE_COCOA
 
 
 #if wxOSX_USE_COCOA
 

-#if wxUSE_BASE
+#if wxUSE_GUI

 
 // Emit a beeeeeep
 void wxBell()
 
 // Emit a beeeeeep
 void wxBell()


@@ -45,17 +45,13 @@ void wxBell()
     NSBeep();
 }
 
     NSBeep();
 }
 

-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-

 @implementation wxNSAppController
 
 - (void)applicationWillFinishLaunching:(NSNotification *)application { 
     wxUnusedVar(application);
     
 @implementation wxNSAppController
 
 - (void)applicationWillFinishLaunching:(NSNotification *)application { 
     wxUnusedVar(application);
     

-    // we must install our handlers later than setting the app delegates, because otherwise our handlers
-    // get overwritten
+    // we must install our handlers later than setting the app delegate, because otherwise our handlers
+    // get overwritten in the meantime

 
     NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
     
 
     NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
     


@@ -241,6 +237,8 @@ void wxBell()
 }
 @end
 
 }
 @end
 

+wxNSAppController* appcontroller = nil;
+

 bool wxApp::DoInitGui()
 {
     wxMacAutoreleasePool pool;
 bool wxApp::DoInitGui()
 {
     wxMacAutoreleasePool pool;


@@ -248,8 +246,8 @@ bool wxApp::DoInitGui()
 
     if (!sm_isEmbedded)
     {
 
     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
 
         // 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()
 {
 
 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)


@@ -305,10 +309,10 @@ wxMouseState wxGetMouseState()
     ms.SetMiddleDown( (buttons & 0x04) != 0 );
     ms.SetRightDown( (buttons & 0x02) != 0 );
     
     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.SetShiftDown(modifiers & NSShiftKeyMask);
     ms.SetAltDown(modifiers & NSAlternateKeyMask);

-    ms.SetMetaDown(modifiers & NSCommandKeyMask);
+    ms.SetControlDown(modifiers & NSCommandKeyMask);

     
     return ms;
 }
     
     return ms;
 }