diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp index da75c15489..f4a209b0a7 100644 --- a/src/osx/carbon/app.cpp +++ b/src/osx/carbon/app.cpp @@ -841,7 +841,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) return true; } -#if wxOSX_USE_CARBON +#if wxOSX_USE_COCOA_OR_CARBON bool wxApp::CallOnInit() { wxMacAutoreleasePool autoreleasepool; diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index d14be5cd19..81f1d186f8 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -99,7 +99,6 @@ void wxMacWakeUp() - (void)applicationWillFinishLaunching:(NSApplication *)application { wxUnusedVar(application); - wxTheApp->OnInit(); } - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename; @@ -227,14 +226,6 @@ void wxMacWakeUp() } @end -bool wxApp::CallOnInit() -{ - if ( sm_isEmbedded ) - return OnInit(); - - return true; -} - bool wxApp::DoInitGui() { wxMacAutoreleasePool pool;