Add wxTimer::StartOnce().

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

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 4a4c1e0c33e1d4341f39670f172627fc0111b407..66bf2fb6828e04ff0a8c0f6d0f8a9199a6507b10 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,10 +45,6 @@ void wxBell()
     NSBeep();
 }
 
     NSBeep();
 }
 

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

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


@@ -75,7 +71,7 @@ void wxBell()
     const size_t count = [fileNames count];
     for (i = 0; i < count; i++)
     {
     const size_t count = [fileNames count];
     for (i = 0; i < count; i++)
     {

-        fileList.Add( wxCFStringRef::AsString([fileNames objectAtIndex:i]) );
+        fileList.Add( wxCFStringRef::AsStringWithNormalizationFormC([fileNames objectAtIndex:i]) );

     }
 
     wxTheApp->MacOpenFiles(fileList);
     }
 
     wxTheApp->MacOpenFiles(fileList);


@@ -241,17 +237,48 @@ void wxBell()
 }
 @end
 
 }
 @end
 

-wxNSAppController* appcontroller = nil;
+// here we subclass NSApplication, for the purpose of being able to override sendEvent.
+@interface wxNSApplication : NSApplication
+{
+}
+
+- (void)sendEvent:(NSEvent *)anEvent;
+
+@end
+
+@implementation wxNSApplication
+
+/* This is needed because otherwise we don't receive any key-up events for command-key
+ combinations (an AppKit bug, apparently)                      */
+- (void)sendEvent:(NSEvent *)anEvent
+{
+    if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask))
+        [[self keyWindow] sendEvent:anEvent];
+    else [super sendEvent:anEvent];
+}
+
+@end
+
+WX_NSObject appcontroller = nil;
+
+NSLayoutManager* gNSLayoutManager = nil;
+
+WX_NSObject wxApp::OSXCreateAppController()
+{
+    return [[wxNSAppController alloc] init];
+}

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

-    [NSApplication sharedApplication];

 
     if (!sm_isEmbedded)
     {
 
     if (!sm_isEmbedded)
     {

-        appcontroller = [[wxNSAppController alloc] init];
+        [wxNSApplication sharedApplication];
+
+        appcontroller = OSXCreateAppController();

         [NSApp setDelegate:appcontroller];
         [NSApp setDelegate:appcontroller];

+        [NSColor setIgnoresAlpha:NO];

 
         // 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


@@ -259,6 +286,8 @@ bool wxApp::DoInitGui()
         [NSApp finishLaunching];
 #endif
     }
         [NSApp finishLaunching];
 #endif
     }

+    gNSLayoutManager = [[NSLayoutManager alloc] init];
+    

     return true;
 }
 
     return true;
 }
 


@@ -270,6 +299,11 @@ void wxApp::DoCleanUp()
         [appcontroller release];
         appcontroller = nil;
     }
         [appcontroller release];
         appcontroller = nil;
     }

+    if ( gNSLayoutManager != nil )
+    {
+        [gNSLayoutManager release];
+        gNSLayoutManager = nil;
+    }

 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)