add support for alpha in color dialog on OSX, see #14127

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

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 9a7d446ff8e30746288fdbc5629790d78b07053d..f4702bb185709205d8bbf845c25f1d62249cae30 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -71,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);


@@ -259,7 +259,14 @@ void wxBell()
 
 @end
 
 
 @end
 

-wxNSAppController* appcontroller = nil;
+WX_NSObject appcontroller = nil;
+
+NSLayoutManager* gNSLayoutManager = nil;
+
+WX_NSObject wxApp::OSXCreateAppController()
+{
+    return [[wxNSAppController alloc] init];
+}

 
 bool wxApp::DoInitGui()
 {
 
 bool wxApp::DoInitGui()
 {


@@ -269,7 +276,7 @@ bool wxApp::DoInitGui()
     {
         [wxNSApplication sharedApplication];
 
     {
         [wxNSApplication sharedApplication];
 

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

         [NSApp setDelegate:appcontroller];
 
         // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads
         [NSApp setDelegate:appcontroller];
 
         // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads


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

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

     return true;
 }
 
     return true;
 }
 


@@ -289,6 +298,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)