X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fdfc5b3a2dcdd6ed5e7938f1a5e099f34d9f259..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/common/appbase.cpp?ds=inline diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 3901c4def1..697aa2dd87 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/base/appbase.cpp +// Name: src/common/appbase.cpp // Purpose: implements wxAppConsole class // Author: Vadim Zeitlin // Modified by: @@ -25,13 +25,16 @@ #endif #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox() + #endif + #include "wx/list.h" #include "wx/app.h" #include "wx/intl.h" - #include "wx/list.h" #include "wx/log.h" + #include "wx/utils.h" #endif //WX_PRECOMP -#include "wx/utils.h" #include "wx/apptrait.h" #include "wx/cmdline.h" #include "wx/confbase.h" @@ -43,10 +46,6 @@ #include // for SIGTRAP used by wxTrap() #endif //Win/Unix -#if defined(__WXMSW__) - #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox() -#endif - #if wxUSE_FONTMAP #include "wx/fontmap.h" #endif // wxUSE_FONTMAP @@ -57,22 +56,29 @@ #endif #if defined(__WXMAC__) - // VZ: MacTypes.h is enough under Mac OS X (where I could test it) but - // I don't know which headers are needed under earlier systems so - // include everything when in doubt #ifdef __DARWIN__ - #include "MacTypes.h" + #include #else #include "wx/mac/private.h" // includes mac headers #endif #endif // __WXMAC__ #ifdef __WXDEBUG__ - #ifdef wxUSE_STACKWALKER + #if wxUSE_STACKWALKER #include "wx/stackwalk.h" + #ifdef __WXMSW__ + #include "wx/msw/debughlp.h" + #endif #endif // wxUSE_STACKWALKER #endif // __WXDEBUG__ +// wxABI_VERSION can be defined when compiling applications but it should be +// left undefined when compiling the library itself, it is then set to its +// default value in version.h +#if wxABI_VERSION != wxMAJOR_VERSION * 10000 + wxMINOR_VERSION * 100 + 99 +#error "wxABI_VERSION should not be defined when compiling the library" +#endif + // ---------------------------------------------------------------------------- // private functions prototypes // ---------------------------------------------------------------------------- @@ -86,6 +92,7 @@ static void ShowAssertDialog(const wxChar *szFile, int nLine, + const wxChar *szFunc, const wxChar *szCond, const wxChar *szMsg, wxAppTraits *traits = NULL); @@ -137,19 +144,11 @@ wxAppConsole::~wxAppConsole() // initilization/cleanup // ---------------------------------------------------------------------------- -bool wxAppConsole::Initialize(int& argc, wxChar **argv) +bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig) { -#if wxUSE_LOG - // If some code logged something before wxApp instance was created, - // wxLogStderr was set as the target. Undo it here by destroying the - // current target. It will be re-created next time logging is needed, but - // this time wxAppTraits will be used: - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG - // remember the command line arguments - this->argc = argc; - this->argv = argv; + argc = argcOrig; + argv = argvOrig; #ifndef __WXPALMOS__ if ( m_appName.empty() && argv ) @@ -208,10 +207,6 @@ int wxAppConsole::OnExit() delete wxConfigBase::Set((wxConfigBase *) NULL); #endif // wxUSE_CONFIG - // use Set(NULL) and not Get() to avoid creating a message output object on - // demand when we just want to delete it - delete wxMessageOutput::Set(NULL); - return 0; } @@ -273,7 +268,7 @@ void wxAppConsole::ProcessPendingEvents() if ( !wxPendingEventsLocker ) return; #endif - + // ensure that we're the only thread to modify the pending events list wxENTER_CRIT_SECT( *wxPendingEventsLocker ); @@ -285,6 +280,15 @@ void wxAppConsole::ProcessPendingEvents() // iterate until the list becomes empty wxList::compatibility_iterator node = wxPendingEvents->GetFirst(); + + while (node && + ((wxEvtHandler *)node->GetData())->IsEventHandlingInProgress() && + ((wxEvtHandler *)node->GetData())->IsReentranceAllowed() == false) + { + // skip over event + node = node->GetNext(); + } + while (node) { wxEvtHandler *handler = (wxEvtHandler *)node->GetData(); @@ -293,12 +297,20 @@ void wxAppConsole::ProcessPendingEvents() // In ProcessPendingEvents(), new handlers might be add // and we can safely leave the critical section here. wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); - + handler->ProcessPendingEvents(); wxENTER_CRIT_SECT( *wxPendingEventsLocker ); node = wxPendingEvents->GetFirst(); + + while (node && + ((wxEvtHandler *)node->GetData())->IsEventHandlingInProgress() && + ((wxEvtHandler *)node->GetData())->IsReentranceAllowed() == false) + { + // skip over event + node = node->GetNext(); + } } wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); @@ -325,17 +337,6 @@ wxAppConsole::HandleEvent(wxEvtHandler *handler, (handler->*func)(event); } -bool -wxAppConsole::OnExceptionInMainLoop() -{ - throw; - - // some compilers are too stupid to know that we never return after throw -#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200) - return false; -#endif -} - #endif // wxUSE_EXCEPTIONS // ---------------------------------------------------------------------------- @@ -450,12 +451,21 @@ bool wxAppConsole::CheckBuildOptions(const char *optionsSignature, #ifdef __WXDEBUG__ +void wxAppConsole::OnAssertFailure(const wxChar *file, + int line, + const wxChar *func, + const wxChar *cond, + const wxChar *msg) +{ + ShowAssertDialog(file, line, func, cond, msg, GetTraits()); +} + void wxAppConsole::OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg) { - ShowAssertDialog(file, line, cond, msg, GetTraits()); + OnAssertFailure(file, line, NULL, cond, msg); } #endif // __WXDEBUG__ @@ -603,19 +613,10 @@ void wxTrap() #endif // Win/Unix } -void wxAssert(int cond, - const wxChar *szFile, - int nLine, - const wxChar *szCond, - const wxChar *szMsg) -{ - if ( !cond ) - wxOnAssert(szFile, nLine, szCond, szMsg); -} - // this function is called when an assert fails void wxOnAssert(const wxChar *szFile, int nLine, + const char *szFunc, const wxChar *szCond, const wxChar *szMsg) { @@ -634,16 +635,19 @@ void wxOnAssert(const wxChar *szFile, s_bInAssert = true; + // __FUNCTION__ is always in ASCII, convert it to wide char if needed + const wxString strFunc = wxString::FromAscii(szFunc); + if ( !wxTheApp ) { // by default, show the assert dialog box -- we can't customize this // behaviour - ShowAssertDialog(szFile, nLine, szCond, szMsg); + ShowAssertDialog(szFile, nLine, strFunc, szCond, szMsg); } else { // let the app process it as it wants - wxTheApp->OnAssert(szFile, nLine, szCond, szMsg); + wxTheApp->OnAssertFailure(szFile, nLine, strFunc, szCond, szMsg); } s_bInAssert = false; @@ -707,35 +711,11 @@ bool DoShowAssertDialog(const wxString& msg) return false; } -// show the assert modal dialog -static -void ShowAssertDialog(const wxChar *szFile, - int nLine, - const wxChar *szCond, - const wxChar *szMsg, - wxAppTraits *traits) +#if wxUSE_STACKWALKER +static wxString GetAssertStackTrace() { - // this variable can be set to true to suppress "assert failure" messages - static bool s_bNoAsserts = false; - - wxString msg; - msg.reserve(2048); - - // make life easier for people using VC++ IDE by using this format: like - // this, clicking on the message will take us immediately to the place of - // the failed assert - msg.Printf(wxT("%s(%d): assert \"%s\" failed"), szFile, nLine, szCond); - - if ( szMsg ) - { - msg << _T(": ") << szMsg; - } - else // no message given - { - msg << _T('.'); - } + wxString stackTrace; -#if wxUSE_STACKWALKER class StackDump : public wxStackWalker { public: @@ -746,7 +726,11 @@ void ShowAssertDialog(const wxChar *szFile, protected: virtual void OnStackFrame(const wxStackFrame& frame) { - m_stackTrace << wxString::Format(_T("[%02d] "), frame.GetLevel()); + m_stackTrace << wxString::Format + ( + _T("[%02d] "), + wx_truncate_cast(int, frame.GetLevel()) + ); wxString name = frame.GetName(); if ( !name.empty() ) @@ -755,11 +739,7 @@ void ShowAssertDialog(const wxChar *szFile, } else { - m_stackTrace << wxString::Format - ( - _T("0x%08lx"), - (unsigned long)frame.GetAddress() - ); + m_stackTrace << wxString::Format(_T("%p"), frame.GetAddress()); } if ( frame.HasSourceLocation() ) @@ -778,24 +758,60 @@ void ShowAssertDialog(const wxChar *szFile, }; StackDump dump; - dump.Walk(5); // don't show OnAssert() call itself - wxString stackTrace = dump.GetStackTrace(); + dump.Walk(2); // don't show OnAssert() call itself + stackTrace = dump.GetStackTrace(); // don't show more than maxLines or we could get a dialog too tall to be // shown on screen: 20 should be ok everywhere as even with 15 pixel high // characters it is still only 300 pixels... - const int maxLines = 20; - int count = stackTrace.Freq(wxT('\n')); - if (count > maxLines) + static const int maxLines = 20; + const int count = stackTrace.Freq(wxT('\n')); + for ( int i = 0; i < count - maxLines; i++ ) + stackTrace = stackTrace.BeforeLast(wxT('\n')); + + return stackTrace; +} +#endif // wxUSE_STACKWALKER + +// show the assert modal dialog +static +void ShowAssertDialog(const wxChar *szFile, + int nLine, + const wxChar *szFunc, + const wxChar *szCond, + const wxChar *szMsg, + wxAppTraits *traits) +{ + // this variable can be set to true to suppress "assert failure" messages + static bool s_bNoAsserts = false; + + wxString msg; + msg.reserve(2048); + + // make life easier for people using VC++ IDE by using this format: like + // this, clicking on the message will take us immediately to the place of + // the failed assert + msg.Printf(wxT("%s(%d): assert \"%s\" failed"), szFile, nLine, szCond); + + // add the function name, if any + if ( szFunc && *szFunc ) + msg << _T(" in ") << szFunc << _T("()"); + + // and the message itself + if ( szMsg ) { - int i; - for (i = 0; i < count - maxLines; i++) - stackTrace = stackTrace.BeforeLast(wxT('\n')); + msg << _T(": ") << szMsg; } + else // no message given + { + msg << _T('.'); + } + +#if wxUSE_STACKWALKER + const wxString stackTrace = GetAssertStackTrace(); if ( !stackTrace.empty() ) { - msg << _T("\n\nCall stack:\n") - << stackTrace; + msg << _T("\n\nCall stack:\n") << stackTrace; } #endif // wxUSE_STACKWALKER @@ -839,4 +855,3 @@ void ShowAssertDialog(const wxChar *szFile, } #endif // __WXDEBUG__ -