Revert "using #ifdef wxABORT_ON_CONFIG_ERROR not just #if as elsewhere"

This reverts commit r74656, because it breaks initialization order by
calling OnInit() too late.  See
https://groups.google.com/d/topic/wx-dev/H5vgc2VO7K4/discussion

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

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

-#if wxOSX_USE_IPHONE

     bool                m_onInitResult;
     bool                m_onInitResult;

-#endif
+    

 public:
 
 #endif
 public:
 
 #endif

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index 30fb4b076f5666cb1fe3ed4debc6b6e3b981a013..30e3ba48bea227754cc942527b2e0db5ab1e7177 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -403,9 +403,7 @@ void wxApp::MacReopenApp()
 #if wxOSX_USE_COCOA_OR_IPHONE
 void wxApp::OSXOnWillFinishLaunching()
 {
 #if wxOSX_USE_COCOA_OR_IPHONE
 void wxApp::OSXOnWillFinishLaunching()
 {

-#if wxOSX_USE_IPHONE

     m_onInitResult = OnInit();
     m_onInitResult = OnInit();

-#endif

 }
 
 void wxApp::OSXOnDidFinishLaunching()
 }
 
 void wxApp::OSXOnDidFinishLaunching()

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index f0d6a398d05e90813c2b1780a8deb08667635073..3e07d7dc2c08642ddc5ac0fc39688ce378687884 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;
 bool wxApp::CallOnInit()
 {
     wxMacAutoreleasePool autoreleasepool;

-    // this will only run one cycle to make sure the OS is ready
+    m_onInitResult = false;

     [NSApp run];
     [NSApp run];

-    return OnInit();
+    return m_onInitResult; 

 }
 
 void wxApp::DoCleanUp()
 }
 
 void wxApp::DoCleanUp()