using #ifdef wxABORT_ON_CONFIG_ERROR not just #if as elsewhere

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

diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
index 723841913ce40566788798fbc8002ec125792c59..b341817be2328d977fb8bb2ec60d355e4f98117a 100644 (file)
--- a/include/wx/osx/app.h
+++ b/include/wx/osx/app.h
@@ -152,8 +152,9 @@ public:
     virtual void         OSXOnWillTerminate();
 
 private:
+#if wxOSX_USE_IPHONE
     bool                m_onInitResult;
-    
+#endif
 public:
 
 #endif

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index d460675d4b9d551f93c2689e865eb3b4c307cada..5285c21bd81c970276956f25e933d1ced8ceb185 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -403,7 +403,9 @@ void wxApp::MacReopenApp()
 #if wxOSX_USE_COCOA_OR_IPHONE
 void wxApp::OSXOnWillFinishLaunching()
 {
+#if wxOSX_USE_IPHONE
     m_onInitResult = OnInit();
+#endif
 }
 
 void wxApp::OSXOnDidFinishLaunching()

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 3e07d7dc2c08642ddc5ac0fc39688ce378687884..f0d6a398d05e90813c2b1780a8deb08667635073 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -314,9 +314,9 @@ bool wxApp::DoInitGui()
 bool wxApp::CallOnInit()
 {
     wxMacAutoreleasePool autoreleasepool;
-    m_onInitResult = false;
+    // this will only run one cycle to make sure the OS is ready
     [NSApp run];
-    return m_onInitResult; 
+    return OnInit();
 }
 
 void wxApp::DoCleanUp()