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
This commit is contained in:
Václav Slavík
2013-09-21 09:28:47 +00:00
parent 0d1903dbda
commit d10fdec4b7
3 changed files with 3 additions and 6 deletions

View File

@@ -152,9 +152,8 @@ public:
virtual void OSXOnWillTerminate();
private:
#if wxOSX_USE_IPHONE
bool m_onInitResult;
#endif
public:
#endif

View File

@@ -403,9 +403,7 @@ void wxApp::MacReopenApp()
#if wxOSX_USE_COCOA_OR_IPHONE
void wxApp::OSXOnWillFinishLaunching()
{
#if wxOSX_USE_IPHONE
m_onInitResult = OnInit();
#endif
}
void wxApp::OSXOnDidFinishLaunching()

View File

@@ -314,9 +314,9 @@ bool wxApp::DoInitGui()
bool wxApp::CallOnInit()
{
wxMacAutoreleasePool autoreleasepool;
// this will only run one cycle to make sure the OS is ready
m_onInitResult = false;
[NSApp run];
return OnInit();
return m_onInitResult;
}
void wxApp::DoCleanUp()