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

Add missing wxUSE_EXCEPTIONS checks.

Browse Source 
Build fixes after StoreCurrentException and RethrowStoredException()
introduction: don't use the latter if exceptions support is turned off.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-08-25 17:47:50 +00:00
parent f01e6a7efd
commit 5d330238d5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/evtloopcmn.cpp
View File

@@ -140,6 +140,7 @@ bool wxEventLoopBase::YieldFor(long eventsToProcess)
DoYieldFor(eventsToProcess); DoYieldFor(eventsToProcess);
#if wxUSE_EXCEPTIONS
// If any handlers called from inside DoYieldFor() threw exceptions, they // If any handlers called from inside DoYieldFor() threw exceptions, they
// may have been stored for later rethrow as it's unsafe to let them escape // may have been stored for later rethrow as it's unsafe to let them escape
// from inside DoYieldFor() itself, as it calls native functions through // from inside DoYieldFor() itself, as it calls native functions through
@@ -147,6 +148,7 @@ bool wxEventLoopBase::YieldFor(long eventsToProcess)
// code, we may rethrow them. // code, we may rethrow them.
if ( wxTheApp ) if ( wxTheApp )
wxTheApp->RethrowStoredException(); wxTheApp->RethrowStoredException();
#endif // wxUSE_EXCEPTIONS
return true; return true;
} }
@@ -218,10 +220,12 @@ bool wxEventLoopManual::ProcessEvents()
const bool res = Dispatch(); const bool res = Dispatch();
#if wxUSE_EXCEPTIONS
// Rethrow any exceptions which could have been produced by the handlers // Rethrow any exceptions which could have been produced by the handlers
// ran by Dispatch(). // ran by Dispatch().
if ( wxTheApp ) if ( wxTheApp )
wxTheApp->RethrowStoredException(); wxTheApp->RethrowStoredException();
#endif // wxUSE_EXCEPTIONS
return res; return res;
} }

2
src/gtk/evtloop.cpp
View File

@@ -78,10 +78,12 @@ int wxGUIEventLoop::DoRun()
OnExit(); OnExit();
#if wxUSE_EXCEPTIONS
// Rethrow any exceptions which could have been produced by the handlers // Rethrow any exceptions which could have been produced by the handlers
// ran by the event loop. // ran by the event loop.
if ( wxTheApp ) if ( wxTheApp )
wxTheApp->RethrowStoredException(); wxTheApp->RethrowStoredException();
#endif // wxUSE_EXCEPTIONS
return m_exitcode; return m_exitcode;
} }