X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf188f1add12abe2238d51d0568acc2a386e8051..d6045bb81d13ef3e9c36c78db8687d0390e3c6b7:/src/common/appcmn.cpp diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 63cfeb9c77..b179284223 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: common/appcmn.cpp -// Purpose: wxAppBase methods common to all platforms +// Purpose: wxAppConsole and wxAppBase methods common to all platforms // Author: Vadim Zeitlin // Modified by: // Created: 18.10.99 @@ -32,15 +32,21 @@ #include "wx/app.h" #include "wx/intl.h" #include "wx/list.h" + #include "wx/log.h" + #include "wx/msgdlg.h" #endif -#include "wx/cmdline.h" +#include "wx/apptrait.h" +#if wxUSE_FONTMAP + #include "wx/fontmap.h" +#endif // wxUSE_FONTMAP +#include "wx/msgout.h" #include "wx/thread.h" -#include "wx/confbase.h" +#include "wx/utils.h" -// =========================================================================== -// implementation -// =========================================================================== +// ============================================================================ +// wxAppBase implementation +// ============================================================================ // ---------------------------------------------------------------------------- // initialization and termination @@ -48,20 +54,30 @@ wxAppBase::wxAppBase() { - wxTheApp = (wxApp *)this; - - // VZ: what's this? is it obsolete? - m_wantDebugOutput = FALSE; - -#if wxUSE_GUI m_topWindow = (wxWindow *)NULL; m_useBestVisual = FALSE; - m_exitOnFrameDelete = TRUE; m_isActive = TRUE; -#endif // wxUSE_GUI + + // We don't want to exit the app if the user code shows a dialog from its + // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete + // to Yes initially as this dialog would be the last top level window. + // OTOH, if we set it to No initially we'll have to overwrite it with Yes + // when we enter our OnRun() because we do want the default behaviour from + // then on. But this would be a problem if the user code calls + // SetExitOnFrameDelete(FALSE) from OnInit(). + // + // So we use the special "Later" value which is such that + // GetExitOnFrameDelete() returns FALSE for it but which we know we can + // safely (i.e. without losing the effect of the users SetExitOnFrameDelete + // call) overwrite in OnRun() + m_exitOnFrameDelete = Later; +} + +wxAppBase::~wxAppBase() +{ + // this destructor is required for Darwin } -#if wxUSE_GUI bool wxAppBase::OnInitGui() { #ifdef __WXUNIVERSAL__ @@ -71,190 +87,153 @@ bool wxAppBase::OnInitGui() return TRUE; } -#endif // wxUSE_GUI -int wxAppBase::OnExit() +int wxAppBase::OnRun() { -#if wxUSE_CONFIG - // delete the config object if any (don't use Get() here, but Set() - // because Get() could create a new config object) - delete wxConfigBase::Set((wxConfigBase *) NULL); -#endif // wxUSE_CONFIG + // see the comment in ctor: if the initial value hasn't been changed, use + // the default Yes from now on + if ( m_exitOnFrameDelete == Later ) + { + m_exitOnFrameDelete = Yes; + } + //else: it has been changed, assume the user knows what he is doing -#ifdef __WXUNIVERSAL__ - delete wxTheme::Set(NULL); -#endif // __WXUNIVERSAL__ + return MainLoop(); +} - return 0; +void wxAppBase::Exit() +{ + ExitMainLoop(); } -// --------------------------------------------------------------------------- -// wxAppBase +wxAppTraits *wxAppBase::CreateTraits() +{ + return wxAppTraits::CreateGUI(); +} + +// ---------------------------------------------------------------------------- +// misc // ---------------------------------------------------------------------------- -void wxAppBase::ProcessPendingEvents() +void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus)) { - // ensure that we're the only thread to modify the pending events list - wxENTER_CRIT_SECT( *wxPendingEventsLocker ); - - if ( !wxPendingEvents ) - { - wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); + if ( active == m_isActive ) return; - } - // iterate until the list becomes empty - wxNode *node = wxPendingEvents->First(); - while (node) - { - wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - delete node; + m_isActive = active; - // 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 ); + wxActivateEvent event(wxEVT_ACTIVATE_APP, active); + event.SetEventObject(this); - node = wxPendingEvents->First(); - } - - wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); + (void)ProcessEvent(event); } // ---------------------------------------------------------------------------- -// misc +// wxGUIAppTraitsBase // ---------------------------------------------------------------------------- -#if wxUSE_GUI +#if wxUSE_LOG -void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus)) +wxLog *wxGUIAppTraitsBase::CreateLogTarget() { - m_isActive = active; + return new wxLogGui; } -#endif // wxUSE_GUI +#endif // wxUSE_LOG -// ---------------------------------------------------------------------------- -// cmd line parsing -// ---------------------------------------------------------------------------- +wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput() +{ + // The standard way of printing help on command line arguments (app --help) + // is (according to common practice): + // - console apps: to stderr (on any platform) + // - GUI apps: stderr on Unix platforms (!) + // message box under Windows and others +#ifdef __UNIX__ + return new wxMessageOutputStderr; +#else // !__UNIX__ + // wxMessageOutputMessageBox doesn't work under Motif + #ifdef __WXMOTIF__ + return new wxMessageOutputLog; + #else + return new wxMessageOutputMessageBox; + #endif +#endif // __UNIX__/!__UNIX__ +} + +#if wxUSE_FONTMAP -bool wxAppBase::OnInit() +wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper() { -#if wxUSE_CMDLINE_PARSER - wxCmdLineParser parser(argc, argv); + return new wxFontMapper; +} + +#endif // wxUSE_FONTMAP - OnInitCmdLine(parser); +#ifdef __WXDEBUG__ - bool cont; - switch ( parser.Parse() ) +bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg) +{ + // under MSW we prefer to use the base class version using ::MessageBox() + // even if wxMessageBox() is available because it has less chances to + // double fault our app than our wxMessageBox() +#if defined(__WXMSW__) || !wxUSE_MSGDLG + return wxAppTraitsBase::ShowAssertDialog(msg); +#else // wxUSE_MSGDLG + // this message is intentionally not translated -- it is for + // developpers only + wxString msgDlg(msg); + msgDlg += wxT("\nDo you want to stop the program?\n") + wxT("You can also choose [Cancel] to suppress ") + wxT("further warnings."); + + switch ( wxMessageBox(msgDlg, wxT("wxWindows Debug Alert"), + wxYES_NO | wxCANCEL | wxICON_STOP ) ) { - case -1: - cont = OnCmdLineHelp(parser); + case wxYES: + wxTrap(); break; - case 0: - cont = OnCmdLineParsed(parser); - break; + case wxCANCEL: + // no more asserts + return true; - default: - cont = OnCmdLineError(parser); - break; + //case wxNO: nothing to do } - if ( !cont ) - return FALSE; -#endif // wxUSE_CMDLINE_PARSER - - return TRUE; + return false; +#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG } -#if wxUSE_CMDLINE_PARSER +#endif // __WXDEBUG__ -#define OPTION_VERBOSE _T("verbose") -#define OPTION_THEME _T("theme") - -void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) +bool wxGUIAppTraitsBase::HasStderr() { - // the standard command line options - static const wxCmdLineEntryDesc cmdLineDesc[] = - { - { - wxCMD_LINE_SWITCH, - _T("h"), - _T("help"), - gettext_noop("show this help message"), - wxCMD_LINE_VAL_NONE, - wxCMD_LINE_OPTION_HELP - }, - -#if wxUSE_LOG - { - wxCMD_LINE_SWITCH, - _T(""), - OPTION_VERBOSE, - gettext_noop("generate verbose log messages") - }, -#endif wxUSE_LOG - -#ifdef __WXUNIVERSAL__ - { - wxCMD_LINE_OPTION, - _T(""), - OPTION_THEME, - gettext_noop("specify the theme to use"), - wxCMD_LINE_VAL_STRING - }, -#endif // __WXUNIVERSAL__ - - // terminator - { wxCMD_LINE_NONE } - }; - - parser.SetDesc(cmdLineDesc); + // we consider that under Unix stderr always goes somewhere, even if the + // user doesn't always see it under GUI desktops +#ifdef __UNIX__ + return true; +#else + return false; +#endif } -bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) +void wxGUIAppTraitsBase::ScheduleForDestroy(wxObject *object) { -#if wxUSE_LOG - if ( parser.Found(OPTION_VERBOSE) ) - { - wxLog::SetVerbose(TRUE); - } -#endif // wxUSE_LOG - -#ifdef __WXUNIVERSAL__ - wxString themeName; - if ( parser.Found(OPTION_THEME, &themeName) ) - { - wxTheme *theme = wxTheme::Create(themeName); - if ( !theme ) - { - wxLogError(_("Unsupported theme '%s'."), themeName.c_str()); - - return FALSE; - } - - wxTheme::Set(theme); - } -#endif // __WXUNIVERSAL__ - - return TRUE; + if ( !wxPendingDelete.Member(object) ) + wxPendingDelete.Append(object); } -bool wxAppBase::OnCmdLineHelp(wxCmdLineParser& parser) +void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) { - parser.Usage(); - - return FALSE; + wxPendingDelete.DeleteObject(object); } -bool wxAppBase::OnCmdLineError(wxCmdLineParser& parser) -{ - parser.Usage(); +// ---------------------------------------------------------------------------- +// wxAppTraits +// ---------------------------------------------------------------------------- - return FALSE; +wxAppTraits *wxAppTraitsBase::CreateGUI() +{ + return new wxGUIAppTraits; } -#endif // wxUSE_CMDLINE_PARSER -