X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aea33a3e8578f3d9451e95056b11e3a9b46111dc..4520d5836a52526c64e5b9469e6acee2221476d2:/src/common/appbase.cpp diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 993d4a8d53..5a741b70ac 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: src/common/appbase.cpp -// Purpose: implements wxAppConsole class +// Purpose: implements wxAppConsoleBase class // Author: Vadim Zeitlin // Modified by: // Created: 19.06.2003 (extracted from common/appcmn.cpp) @@ -44,30 +44,25 @@ #include "wx/msgout.h" #include "wx/ptr_scpd.h" #include "wx/tokenzr.h" +#include "wx/thread.h" +#if wxUSE_EXCEPTIONS && wxUSE_STL + #include + #include +#endif + +#ifndef __WXPALMOS5__ #if !defined(__WXMSW__) || defined(__WXMICROWIN__) #include // for SIGTRAP used by wxTrap() #endif //Win/Unix #include +#endif // ! __WXPALMOS5__ #if wxUSE_FONTMAP #include "wx/fontmap.h" #endif // wxUSE_FONTMAP -#if defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS - // For MacTypes.h for Debugger function - #include -#endif - -#if defined(__WXMAC__) - #ifdef __DARWIN__ - #include - #else - #include "wx/mac/private.h" // includes mac headers - #endif -#endif // __WXMAC__ - #ifdef __WXDEBUG__ #if wxUSE_STACKWALKER #include "wx/stackwalk.h" @@ -75,6 +70,8 @@ #include "wx/msw/debughlp.h" #endif #endif // wxUSE_STACKWALKER + + #include "wx/recguard.h" #endif // __WXDEBUG__ // wxABI_VERSION can be defined when compiling applications but it should be @@ -110,9 +107,11 @@ // global vars // ---------------------------------------------------------------------------- -wxAppConsole *wxAppConsole::ms_appInstance = NULL; +wxAppConsole *wxAppConsoleBase::ms_appInstance = NULL; + +wxAppInitializerFunction wxAppConsoleBase::ms_appInitFn = NULL; -wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL; +wxSocketManager *wxAppTraitsBase::ms_manager = NULL; // ---------------------------------------------------------------------------- // wxEventLoopPtr @@ -122,19 +121,19 @@ wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL; wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopBase) // ============================================================================ -// wxAppConsole implementation +// wxAppConsoleBase implementation // ============================================================================ // ---------------------------------------------------------------------------- // ctor/dtor // ---------------------------------------------------------------------------- -wxAppConsole::wxAppConsole() +wxAppConsoleBase::wxAppConsoleBase() { m_traits = NULL; m_mainLoop = NULL; - ms_appInstance = this; + ms_appInstance = static_cast(this); #ifdef __WXDEBUG__ SetTraceMasks(); @@ -148,7 +147,7 @@ wxAppConsole::wxAppConsole() #endif } -wxAppConsole::~wxAppConsole() +wxAppConsoleBase::~wxAppConsoleBase() { delete m_traits; } @@ -157,22 +156,18 @@ wxAppConsole::~wxAppConsole() // initilization/cleanup // ---------------------------------------------------------------------------- -bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig) +bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv) { #if wxUSE_INTL GetTraits()->SetLocale(); #endif // wxUSE_INTL - // remember the command line arguments - argc = argcOrig; - argv = argvOrig; - #if wxUSE_THREADS wxPendingEventsLocker = new wxCriticalSection; #endif #ifndef __WXPALMOS__ - if ( m_appName.empty() && argv ) + if ( m_appName.empty() && argv && argv[0] ) { // the application name is, by default, the name of its executable file wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL); @@ -182,12 +177,12 @@ bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig) return true; } -wxEventLoopBase *wxAppConsole::CreateMainLoop() +wxEventLoopBase *wxAppConsoleBase::CreateMainLoop() { return GetTraits()->CreateEventLoop(); } -void wxAppConsole::CleanUp() +void wxAppConsoleBase::CleanUp() { if ( m_mainLoop ) { @@ -208,7 +203,7 @@ void wxAppConsole::CleanUp() // OnXXX() callbacks // ---------------------------------------------------------------------------- -bool wxAppConsole::OnInit() +bool wxAppConsoleBase::OnInit() { #if wxUSE_CMDLINE_PARSER wxCmdLineParser parser(argc, argv); @@ -238,12 +233,12 @@ bool wxAppConsole::OnInit() return true; } -int wxAppConsole::OnRun() +int wxAppConsoleBase::OnRun() { return MainLoop(); } -int wxAppConsole::OnExit() +int wxAppConsoleBase::OnExit() { #if wxUSE_CONFIG // delete the config object if any (don't use Get() here, but Set() @@ -254,7 +249,7 @@ int wxAppConsole::OnExit() return 0; } -void wxAppConsole::Exit() +void wxAppConsoleBase::Exit() { if (m_mainLoop != NULL) ExitMainLoop(); @@ -266,12 +261,12 @@ void wxAppConsole::Exit() // traits stuff // ---------------------------------------------------------------------------- -wxAppTraits *wxAppConsole::CreateTraits() +wxAppTraits *wxAppConsoleBase::CreateTraits() { return new wxConsoleAppTraits; } -wxAppTraits *wxAppConsole::GetTraits() +wxAppTraits *wxAppConsoleBase::GetTraits() { // FIXME-MT: protect this with a CS? if ( !m_traits ) @@ -284,18 +279,25 @@ wxAppTraits *wxAppConsole::GetTraits() return m_traits; } +/* static */ +wxAppTraits *wxAppConsoleBase::GetTraitsIfExists() +{ + wxAppConsole * const app = GetInstance(); + return app ? app->GetTraits() : NULL; +} + // ---------------------------------------------------------------------------- // event processing // ---------------------------------------------------------------------------- -int wxAppConsole::MainLoop() +int wxAppConsoleBase::MainLoop() { wxEventLoopBaseTiedPtr mainLoop(&m_mainLoop, CreateMainLoop()); return m_mainLoop ? m_mainLoop->Run() : -1; } -void wxAppConsole::ExitMainLoop() +void wxAppConsoleBase::ExitMainLoop() { // we should exit from the main event loop, not just any currently active // (e.g. modal dialog) event loop @@ -305,7 +307,7 @@ void wxAppConsole::ExitMainLoop() } } -bool wxAppConsole::Pending() +bool wxAppConsoleBase::Pending() { // use the currently active message loop here, not m_mainLoop, because if // we're showing a modal dialog (with its own event loop) currently the @@ -315,7 +317,7 @@ bool wxAppConsole::Pending() return loop && loop->Pending(); } -bool wxAppConsole::Dispatch() +bool wxAppConsoleBase::Dispatch() { // see comment in Pending() wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); @@ -323,60 +325,65 @@ bool wxAppConsole::Dispatch() return loop && loop->Dispatch(); } -bool wxAppConsole::HasPendingEvents() const +bool wxAppConsoleBase::HasPendingEvents() const { - // ensure that we're the only thread to modify the pending events list wxENTER_CRIT_SECT( *wxPendingEventsLocker ); - if ( !wxPendingEvents ) - { - wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); - return false; - } + bool has = wxPendingEvents && !wxPendingEvents->IsEmpty(); + wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); - return true; + + return has; } -void wxAppConsole::ProcessPendingEvents() +/* static */ +bool wxAppConsoleBase::IsMainLoopRunning() +{ + const wxAppConsole * const app = GetInstance(); + + return app && app->m_mainLoop != NULL; +} + +void wxAppConsoleBase::ProcessPendingEvents() { #if wxUSE_THREADS if ( !wxPendingEventsLocker ) return; #endif - if ( !HasPendingEvents() ) - return; - wxENTER_CRIT_SECT( *wxPendingEventsLocker ); - // iterate until the list becomes empty - wxList::compatibility_iterator node = wxPendingEvents->GetFirst(); - while (node) + if (wxPendingEvents) { - wxEvtHandler *handler = (wxEvtHandler *)node->GetData(); - wxPendingEvents->Erase(node); - - // In ProcessPendingEvents(), new handlers might be add - // and we can safely leave the critical section here. - wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); + // iterate until the list becomes empty: the handlers remove themselves + // from it when they don't have any more pending events + wxList::compatibility_iterator node = wxPendingEvents->GetFirst(); + while (node) + { + // In ProcessPendingEvents(), new handlers might be add + // and we can safely leave the critical section here. + wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); - handler->ProcessPendingEvents(); + wxEvtHandler *handler = (wxEvtHandler *)node->GetData(); + handler->ProcessPendingEvents(); - wxENTER_CRIT_SECT( *wxPendingEventsLocker ); + wxENTER_CRIT_SECT( *wxPendingEventsLocker ); - node = wxPendingEvents->GetFirst(); + // restart as the iterators could have been invalidated + node = wxPendingEvents->GetFirst(); + } } wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); } -void wxAppConsole::WakeUpIdle() +void wxAppConsoleBase::WakeUpIdle() { if ( m_mainLoop ) m_mainLoop->WakeUp(); } -bool wxAppConsole::ProcessIdle() +bool wxAppConsoleBase::ProcessIdle() { wxIdleEvent event; @@ -385,7 +392,7 @@ bool wxAppConsole::ProcessIdle() return event.MoreRequested(); } -int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event)) +int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event)) { // process the events normally by default return -1; @@ -398,21 +405,47 @@ int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event)) #if wxUSE_EXCEPTIONS void -wxAppConsole::HandleEvent(wxEvtHandler *handler, - wxEventFunction func, - wxEvent& event) const +wxAppConsoleBase::HandleEvent(wxEvtHandler *handler, + wxEventFunction func, + wxEvent& event) const { // by default, simply call the handler (handler->*func)(event); } +void wxAppConsoleBase::OnUnhandledException() +{ +#ifdef __WXDEBUG__ + // we're called from an exception handler so we can re-throw the exception + // to recover its type + wxString what; + try + { + throw; + } +#if wxUSE_STL + catch ( std::exception& e ) + { + what.Printf("std::exception of type \"%s\", what() = \"%s\"", + typeid(e).name(), e.what()); + } +#endif // wxUSE_STL + catch ( ... ) + { + what = "unknown exception"; + } + + wxMessageOutputBest().Printf( + "*** Caught unhandled %s; terminating\n", what + ); +#endif // __WXDEBUG__ +} + // ---------------------------------------------------------------------------- // exceptions support // ---------------------------------------------------------------------------- -#if wxUSE_EXCEPTIONS - -bool wxAppConsole::OnExceptionInMainLoop() +bool wxAppConsoleBase::OnExceptionInMainLoop() { throw; @@ -422,9 +455,6 @@ bool wxAppConsole::OnExceptionInMainLoop() #endif } -#endif // wxUSE_EXCEPTIONS - - #endif // wxUSE_EXCEPTIONS // ---------------------------------------------------------------------------- @@ -433,17 +463,17 @@ bool wxAppConsole::OnExceptionInMainLoop() #if wxUSE_CMDLINE_PARSER -#define OPTION_VERBOSE _T("verbose") +#define OPTION_VERBOSE "verbose" -void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser) +void wxAppConsoleBase::OnInitCmdLine(wxCmdLineParser& parser) { // the standard command line options static const wxCmdLineEntryDesc cmdLineDesc[] = { { wxCMD_LINE_SWITCH, - _T("h"), - _T("help"), + "h", + "help", gettext_noop("show this help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP @@ -452,7 +482,7 @@ void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser) #if wxUSE_LOG { wxCMD_LINE_SWITCH, - wxEmptyString, + NULL, OPTION_VERBOSE, gettext_noop("generate verbose log messages"), wxCMD_LINE_VAL_NONE, @@ -461,20 +491,13 @@ void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser) #endif // wxUSE_LOG // terminator - { - wxCMD_LINE_NONE, - wxEmptyString, - wxEmptyString, - wxEmptyString, - wxCMD_LINE_VAL_NONE, - 0x0 - } + wxCMD_LINE_DESC_END }; parser.SetDesc(cmdLineDesc); } -bool wxAppConsole::OnCmdLineParsed(wxCmdLineParser& parser) +bool wxAppConsoleBase::OnCmdLineParsed(wxCmdLineParser& parser) { #if wxUSE_LOG if ( parser.Found(OPTION_VERBOSE) ) @@ -488,14 +511,14 @@ bool wxAppConsole::OnCmdLineParsed(wxCmdLineParser& parser) return true; } -bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser) +bool wxAppConsoleBase::OnCmdLineHelp(wxCmdLineParser& parser) { parser.Usage(); return false; } -bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser) +bool wxAppConsoleBase::OnCmdLineError(wxCmdLineParser& parser) { parser.Usage(); @@ -509,8 +532,8 @@ bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser) // ---------------------------------------------------------------------------- /* static */ -bool wxAppConsole::CheckBuildOptions(const char *optionsSignature, - const char *componentName) +bool wxAppConsoleBase::CheckBuildOptions(const char *optionsSignature, + const char *componentName) { #if 0 // can't use wxLogTrace, not up and running yet printf("checking build options object '%s' (ptr %p) in '%s'\n", @@ -539,19 +562,19 @@ 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) +void wxAppConsoleBase::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) +void wxAppConsoleBase::OnAssert(const wxChar *file, + int line, + const wxChar *cond, + const wxChar *msg) { OnAssertFailure(file, line, NULL, cond, msg); } @@ -618,13 +641,6 @@ void wxConsoleAppTraitsBase::RemoveFromPendingDelete(wxObject * WXUNUSED(object) // nothing to do } -#if wxUSE_SOCKETS -GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable() -{ - return NULL; -} -#endif - // ---------------------------------------------------------------------------- // wxAppTraits // ---------------------------------------------------------------------------- @@ -632,11 +648,40 @@ GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable() #if wxUSE_INTL void wxAppTraitsBase::SetLocale() { - setlocale(LC_ALL, ""); + wxSetlocale(LC_ALL, ""); wxUpdateLocaleIsUtf8(); } #endif +#if wxUSE_THREADS +void wxMutexGuiEnterImpl(); +void wxMutexGuiLeaveImpl(); + +void wxAppTraitsBase::MutexGuiEnter() +{ + wxMutexGuiEnterImpl(); +} + +void wxAppTraitsBase::MutexGuiLeave() +{ + wxMutexGuiLeaveImpl(); +} + +void WXDLLIMPEXP_BASE wxMutexGuiEnter() +{ + wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists(); + if ( traits ) + traits->MutexGuiEnter(); +} + +void WXDLLIMPEXP_BASE wxMutexGuiLeave() +{ + wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists(); + if ( traits ) + traits->MutexGuiLeave(); +} +#endif // wxUSE_THREADS + #ifdef __WXDEBUG__ bool wxAppTraitsBase::ShowAssertDialog(const wxString& msgOriginal) @@ -764,12 +809,6 @@ void wxTrap() { #if defined(__WXMSW__) && !defined(__WXMICROWIN__) DebugBreak(); -#elif defined(__WXMAC__) && !defined(__DARWIN__) - #if __powerc - Debugger(); - #else - SysBreak(); - #endif #elif defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS Debugger(); #elif defined(__UNIX__) @@ -787,20 +826,17 @@ static void wxDoOnAssert(const wxString& szFile, const wxString& szMsg = wxEmptyString) { // FIXME MT-unsafe - static bool s_bInAssert = false; + static int s_bInAssert = 0; - if ( s_bInAssert ) + wxRecursionGuard guard(s_bInAssert); + if ( guard.IsInside() ) { - // He-e-e-e-elp!! we're trapped in endless loop + // can't use assert here to avoid infinite loops, so just trap wxTrap(); - s_bInAssert = false; - return; } - s_bInAssert = true; - if ( !wxTheApp ) { // by default, show the assert dialog box -- we can't customize this @@ -814,8 +850,6 @@ static void wxDoOnAssert(const wxString& szFile, wxTheApp->OnAssertFailure(szFile.c_str(), nLine, szFunc.c_str(), szCond.c_str(), szMsg.c_str()); } - - s_bInAssert = false; } void wxOnAssert(const wxString& szFile, @@ -911,6 +945,7 @@ static void LINKAGEMODE SetTraceMasks() #endif // wxUSE_LOG } +static bool DoShowAssertDialog(const wxString& msg) { // under MSW we can show the dialog even in the console mode @@ -923,7 +958,7 @@ bool DoShowAssertDialog(const wxString& msg) wxT("You can also choose [Cancel] to suppress ") wxT("further warnings."); - switch ( ::MessageBox(NULL, msgDlg, _T("wxWidgets Debug Alert"), + switch ( ::MessageBox(NULL, msgDlg.wx_str(), _T("wxWidgets Debug Alert"), MB_YESNOCANCEL | MB_ICONSTOP ) ) { case IDYES: @@ -991,7 +1026,7 @@ void ShowAssertDialog(const wxString& szFile, #if defined(__WXMSW__) && !defined(__WXMICROWIN__) msg << wxT("\r\n"); - OutputDebugString(msg ); + OutputDebugString(msg.wx_str()); #else // send to stderr wxFprintf(stderr, wxT("%s\n"), msg.c_str());