X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/090a6d7af9c551cf34c3d50f3a438c6b42e51527..43a997b6e2064a189fa73ca1816908fb740ce297:/src/common/appcmn.cpp?ds=sidebyside diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index a53be00281..19ddb1965c 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -42,6 +42,7 @@ #include "wx/confbase.h" #include "wx/tokenzr.h" #include "wx/utils.h" +#include "wx/msgout.h" #if wxUSE_GUI #include "wx/artprov.h" @@ -74,15 +75,6 @@ wxAppBase::wxAppBase() { - // this function is defined by IMPLEMENT_APP() macro in the user code - extern const wxBuildOptions& wxGetBuildOptions(); - - if ( !CheckBuildOptions(wxGetBuildOptions()) ) - { - wxLogFatalError(_T("Mismatch between the program and library build ") - _T("versions detected.")); - } - wxTheApp = (wxApp *)this; #if WXWIN_COMPATIBILITY_2_2 @@ -92,8 +84,21 @@ wxAppBase::wxAppBase() #if wxUSE_GUI m_topWindow = (wxWindow *)NULL; m_useBestVisual = FALSE; - m_exitOnFrameDelete = TRUE; m_isActive = TRUE; + + // 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; #endif // wxUSE_GUI #ifdef __WXDEBUG__ @@ -121,6 +126,19 @@ bool wxAppBase::OnInitGui() } #endif // wxUSE_GUI +int wxAppBase::OnRun() +{ + // 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 + + return MainLoop(); +} + int wxAppBase::OnExit() { #if wxUSE_CONFIG @@ -191,12 +209,40 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus)) #endif // wxUSE_GUI +int wxAppBase::FilterEvent(wxEvent& WXUNUSED(event)) +{ + // process the events normally by default + return -1; +} + +void wxAppBase::DoInit() +{ + if (wxMessageOutput::Get()) + return; + + // NB: 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 +#if wxUSE_GUI && !defined(__UNIX__) + #ifdef __WXMOTIF__ + wxMessageOutput::Set(new wxMessageOutputLog); + #else + wxMessageOutput::Set(new wxMessageOutputMessageBox); + #endif +#else + wxMessageOutput::Set(new wxMessageOutputStderr); +#endif +} + // ---------------------------------------------------------------------------- // cmd line parsing // ---------------------------------------------------------------------------- bool wxAppBase::OnInit() { + DoInit(); #if wxUSE_CMDLINE_PARSER wxCmdLineParser parser(argc, argv); @@ -250,7 +296,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) wxCMD_LINE_SWITCH, _T(""), OPTION_VERBOSE, - gettext_noop("generate verbose log messages") + gettext_noop("generate verbose log messages"), + wxCMD_LINE_VAL_NONE, + 0x0 }, #endif // wxUSE_LOG @@ -260,7 +308,8 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) _T(""), OPTION_THEME, gettext_noop("specify the theme to use"), - wxCMD_LINE_VAL_STRING + wxCMD_LINE_VAL_STRING, + 0x0 }, #endif // __WXUNIVERSAL__ @@ -273,12 +322,20 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) _T(""), OPTION_MODE, gettext_noop("specify display mode to use (e.g. 640x480-16)"), - wxCMD_LINE_VAL_STRING + wxCMD_LINE_VAL_STRING, + 0x0 }, #endif // __WXMGL__ // terminator - { wxCMD_LINE_NONE } + { + wxCMD_LINE_NONE, + _T(""), + _T(""), + _T(""), + wxCMD_LINE_VAL_NONE, + 0x0 + } }; parser.SetDesc(cmdLineDesc); @@ -364,9 +421,17 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts) int verMaj = wxMAJOR_VERSION, verMin = wxMINOR_VERSION; - return wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin); + if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) ) + { + wxLogFatalError(_T("Mismatch between the program and library build ") + _T("versions detected.")); + // normally wxLogFatalError doesn't return + return FALSE; + } #undef wxCMP + + return TRUE; } #ifdef __WXDEBUG__ @@ -408,23 +473,22 @@ void wxTrap() // show the assert modal dialog static -void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg) +void ShowAssertDialog(const wxChar *szFile, + int nLine, + const wxChar *szCond, + const wxChar *szMsg) { // this variable can be set to true to suppress "assert failure" messages static bool s_bNoAsserts = FALSE; wxChar szBuf[4096]; - // make life easier for people using VC++ IDE: clicking on the message - // will take us immediately to the place of the failed assert + // 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 wxSnprintf(szBuf, WXSIZEOF(szBuf), -#ifdef __VISUALC__ - wxT("%s(%d): assert failed"), -#else // !VC++ - // make the error message more clear for all the others - wxT("Assert failed in file %s at line %d"), -#endif // VC/!VC - szFile, nLine); + wxT("%s(%d): assert \"%s\" failed"), + szFile, nLine, szCond); if ( szMsg != NULL ) { @@ -485,7 +549,10 @@ void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg) } // this function is called when an assert fails -void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg) +void wxOnAssert(const wxChar *szFile, + int nLine, + const wxChar *szCond, + const wxChar *szMsg) { // FIXME MT-unsafe static bool s_bInAssert = FALSE; @@ -506,20 +573,23 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg) { // by default, show the assert dialog box - we can't customize this // behaviour - ShowAssertDialog(szFile, nLine, szMsg); + ShowAssertDialog(szFile, nLine, szCond, szMsg); } else { // let the app process it as it wants - wxTheApp->OnAssert(szFile, nLine, szMsg); + wxTheApp->OnAssert(szFile, nLine, szCond, szMsg); } s_bInAssert = FALSE; } -void wxAppBase::OnAssert(const wxChar *file, int line, const wxChar *msg) +void wxAppBase::OnAssert(const wxChar *file, + int line, + const wxChar *cond, + const wxChar *msg) { - ShowAssertDialog(file, line, msg); + ShowAssertDialog(file, line, cond, msg); } #endif //WXDEBUG