wiring OnInit on osx to a later point in event processing

[wxWidgets.git] / src / common / init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index ee45254523a7b28c38c3e72ea8f011fb793aac6d..4de5ae9af936720c25b7bc165c3061d1257336cf 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -473,6 +473,9 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     wxTRY
     {
+#if defined(__WXOSX__) && wxOSX_USE_COCOA_OR_IPHONE
+        // everything done in OnRun using native callbacks
+#else
         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {
@@ -488,7 +491,7 @@ int wxEntryReal(int& argc, wxChar **argv)
         } callOnExit;
 
         WX_SUPPRESS_UNUSED_WARN(callOnExit);
-
+#endif
         // app execution
         return wxTheApp->OnRun();
     }