X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0d8bfa6cd4042d3ea8680ad0145f79e3cb15268..55809d1394516044a90fa34b12070d0f3e9f1439:/src/common/appbase.cpp?ds=inline diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index c1bbddd326..53d05a50fd 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,9 +46,7 @@ #include // for SIGTRAP used by wxTrap() #endif //Win/Unix -#if defined(__WXMSW__) - #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox() -#endif +#include #if wxUSE_FONTMAP #include "wx/fontmap.h" @@ -147,6 +148,10 @@ wxAppConsole::~wxAppConsole() bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig) { +#if wxUSE_INTL + GetTraits()->SetLocale(); +#endif // wxUSE_INTL + // remember the command line arguments argc = argcOrig; argv = argvOrig; @@ -157,7 +162,7 @@ bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig) // the application name is, by default, the name of its executable file wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL); } -#endif +#endif // !__WXPALMOS__ return true; } @@ -238,27 +243,6 @@ wxAppTraits *wxAppConsole::GetTraits() return m_traits; } -// we must implement CreateXXX() in wxApp itself for backwards compatibility -#if WXWIN_COMPATIBILITY_2_4 - -#if wxUSE_LOG - -wxLog *wxAppConsole::CreateLogTarget() -{ - wxAppTraits *traits = GetTraits(); - return traits ? traits->CreateLogTarget() : NULL; -} - -#endif // wxUSE_LOG - -wxMessageOutput *wxAppConsole::CreateMessageOutput() -{ - wxAppTraits *traits = GetTraits(); - return traits ? traits->CreateMessageOutput() : NULL; -} - -#endif // WXWIN_COMPATIBILITY_2_4 - // ---------------------------------------------------------------------------- // event processing // ---------------------------------------------------------------------------- @@ -269,7 +253,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 ); @@ -289,7 +273,7 @@ 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 ); @@ -449,20 +433,11 @@ void wxAppConsole::OnAssert(const wxChar *file, const wxChar *cond, const wxChar *msg) { - OnAssertFailure(file, line, _T(""), cond, msg); + OnAssertFailure(file, line, NULL, cond, msg); } #endif // __WXDEBUG__ -#if WXWIN_COMPATIBILITY_2_4 - -bool wxAppConsole::CheckBuildOptions(const wxBuildOptions& buildOptions) -{ - return CheckBuildOptions(buildOptions.m_signature, "your program"); -} - -#endif - // ============================================================================ // other classes implementations // ============================================================================ @@ -534,13 +509,99 @@ GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable() // wxAppTraits // ---------------------------------------------------------------------------- +#if wxUSE_INTL +void wxAppTraitsBase::SetLocale() +{ + setlocale(LC_ALL, ""); +} +#endif + #ifdef __WXDEBUG__ -bool wxAppTraitsBase::ShowAssertDialog(const wxString& msg) +bool wxAppTraitsBase::ShowAssertDialog(const wxString& msgOriginal) { + wxString msg = msgOriginal; + +#if wxUSE_STACKWALKER +#if !defined(__WXMSW__) + // on Unix stack frame generation may take some time, depending on the + // size of the executable mainly... warn the user that we are working + wxFprintf(stderr, wxT("[Debug] Generating a stack trace... please wait")); + fflush(stderr); +#endif + + const wxString stackTrace = GetAssertStackTrace(); + if ( !stackTrace.empty() ) + msg << _T("\n\nCall stack:\n") << stackTrace; +#endif // wxUSE_STACKWALKER + return DoShowAssertDialog(msg); } +#if wxUSE_STACKWALKER +wxString wxAppTraitsBase::GetAssertStackTrace() +{ + wxString stackTrace; + + class StackDump : public wxStackWalker + { + public: + StackDump() { } + + const wxString& GetStackTrace() const { return m_stackTrace; } + + protected: + virtual void OnStackFrame(const wxStackFrame& frame) + { + m_stackTrace << wxString::Format + ( + _T("[%02d] "), + wx_truncate_cast(int, frame.GetLevel()) + ); + + wxString name = frame.GetName(); + if ( !name.empty() ) + { + m_stackTrace << wxString::Format(_T("%-40s"), name.c_str()); + } + else + { + m_stackTrace << wxString::Format(_T("%p"), frame.GetAddress()); + } + + if ( frame.HasSourceLocation() ) + { + m_stackTrace << _T('\t') + << frame.GetFileName() + << _T(':') + << frame.GetLine(); + } + + m_stackTrace << _T('\n'); + } + + private: + wxString m_stackTrace; + }; + + // 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... + static const int maxLines = 20; + + StackDump dump; + dump.Walk(2, maxLines); // don't show OnAssert() call itself + stackTrace = dump.GetStackTrace(); + + 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 + + #endif // __WXDEBUG__ // ============================================================================ @@ -600,7 +661,7 @@ void wxTrap() // this function is called when an assert fails void wxOnAssert(const wxChar *szFile, int nLine, - const wxChar *szFunc, + const char *szFunc, const wxChar *szCond, const wxChar *szMsg) { @@ -619,16 +680,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, szFunc, szCond, szMsg); + ShowAssertDialog(szFile, nLine, strFunc, szCond, szMsg); } else { // let the app process it as it wants - wxTheApp->OnAssertFailure(szFile, nLine, szFunc, szCond, szMsg); + wxTheApp->OnAssertFailure(szFile, nLine, strFunc, szCond, szMsg); } s_bInAssert = false; @@ -692,68 +756,6 @@ bool DoShowAssertDialog(const wxString& msg) return false; } -#if wxUSE_STACKWALKER -static wxString GetAssertStackTrace() -{ - wxString stackTrace; - - class StackDump : public wxStackWalker - { - public: - StackDump() { } - - const wxString& GetStackTrace() const { return m_stackTrace; } - - protected: - virtual void OnStackFrame(const wxStackFrame& frame) - { - m_stackTrace << wxString::Format - ( - _T("[%02d] "), - wx_truncate_cast(int, frame.GetLevel()) - ); - - wxString name = frame.GetName(); - if ( !name.empty() ) - { - m_stackTrace << wxString::Format(_T("%-40s"), name.c_str()); - } - else - { - m_stackTrace << wxString::Format(_T("%p"), frame.GetAddress()); - } - - if ( frame.HasSourceLocation() ) - { - m_stackTrace << _T('\t') - << frame.GetFileName() - << _T(':') - << frame.GetLine(); - } - - m_stackTrace << _T('\n'); - } - - private: - wxString m_stackTrace; - }; - - StackDump dump; - 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... - 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, @@ -788,14 +790,6 @@ void ShowAssertDialog(const wxChar *szFile, msg << _T('.'); } -#if wxUSE_STACKWALKER - const wxString stackTrace = GetAssertStackTrace(); - if ( !stackTrace.empty() ) - { - msg << _T("\n\nCall stack:\n") << stackTrace; - } -#endif // wxUSE_STACKWALKER - #if wxUSE_THREADS // if we are not in the main thread, output the assert directly and trap // since dialogs cannot be displayed @@ -836,4 +830,3 @@ void ShowAssertDialog(const wxChar *szFile, } #endif // __WXDEBUG__ -