X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/befe64edb45229e114b9c07606356b3aadd876ee..d52a1abad31942f32364bb40808150c4be6c56cd:/src/osx/cocoa/utils.mm?ds=inline diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index ef5aefa538..f4702bb185 100644 --- 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++) { - fileList.Add( wxCFStringRef::AsString([fileNames objectAtIndex:i]) ); + fileList.Add( wxCFStringRef::AsStringWithNormalizationFormC([fileNames objectAtIndex:i]) ); } wxTheApp->MacOpenFiles(fileList); @@ -259,10 +259,14 @@ void wxBell() @end -wxNSAppController* appcontroller = nil; +WX_NSObject appcontroller = nil; NSLayoutManager* gNSLayoutManager = nil; +WX_NSObject wxApp::OSXCreateAppController() +{ + return [[wxNSAppController alloc] init]; +} bool wxApp::DoInitGui() { @@ -272,7 +276,7 @@ bool wxApp::DoInitGui() { [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