Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using #ifdef wxABORT_ON_CONFIG_ERROR not just #if as elsewhere

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-08-14 09:15:16 +00:00
parent 88e264616b
commit b0fa6efc8b
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/osx/app.h
View File

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

2
src/osx/carbon/app.cpp
View File

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

4
src/osx/cocoa/utils.mm
View File

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