moving OnInit back

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index da75c15489e6c3fb2ee3774a47436e552ede4820..f4a209b0a78911ff2f73ba4a921c04353a6d3475 100644 (file)
--- 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;
 }
 
     return true;
 }
 

-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON

 bool wxApp::CallOnInit()
 {
     wxMacAutoreleasePool autoreleasepool;
 bool wxApp::CallOnInit()
 {
     wxMacAutoreleasePool autoreleasepool;

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index d14be5cd19be785938e80df34d80e9332b47e937..81f1d186f846820cf3e7bd297266bb2adaf88d54 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -99,7 +99,6 @@ void wxMacWakeUp()
 
 - (void)applicationWillFinishLaunching:(NSApplication *)application {  
     wxUnusedVar(application);
 
 - (void)applicationWillFinishLaunching:(NSApplication *)application {  
     wxUnusedVar(application);

-       wxTheApp->OnInit();

 }
 
 - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
 }
 
 - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;


@@ -227,14 +226,6 @@ void wxMacWakeUp()
 }
 @end
 
 }
 @end
 

-bool wxApp::CallOnInit()
-{
-    if ( sm_isEmbedded )
-        return OnInit();
-    
-    return true;
-}
-

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