X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf188f1add12abe2238d51d0568acc2a386e8051..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/common/appcmn.cpp diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 63cfeb9c77..314a7654eb 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -32,11 +32,32 @@ #include "wx/app.h" #include "wx/intl.h" #include "wx/list.h" + #if wxUSE_GUI + #include "wx/msgdlg.h" + #endif // wxUSE_GUI #endif #include "wx/cmdline.h" #include "wx/thread.h" #include "wx/confbase.h" +#include "wx/tokenzr.h" +#include "wx/utils.h" + +#if wxUSE_GUI + #include "wx/artprov.h" +#endif // wxUSE_GUI + +#if !defined(__WXMSW__) || defined(__WXMICROWIN__) + #include // for SIGTRAP used by wxTrap() +#endif //Win/Unix + +#if defined(__WXMSW__) + #include "wx/msw/private.h" // includes windows.h for MessageBox() +#endif + +#if defined(__WXMAC__) + #include "wx/mac/private.h" // includes mac headers +#endif // =========================================================================== // implementation @@ -46,12 +67,26 @@ // initialization and termination // ---------------------------------------------------------------------------- +#ifdef __WXDEBUG__ +static void LINKAGEMODE SetTraceMasks() +{ + wxString mask; + if ( wxGetEnv(wxT("WXTRACE"), &mask) ) + { + wxStringTokenizer tkn(mask, wxT(",")); + while ( tkn.HasMoreTokens() ) + wxLog::AddTraceMask(tkn.GetNextToken()); + } +} +#endif + wxAppBase::wxAppBase() { wxTheApp = (wxApp *)this; - // VZ: what's this? is it obsolete? +#if WXWIN_COMPATIBILITY_2_2 m_wantDebugOutput = FALSE; +#endif // WXWIN_COMPATIBILITY_2_2 #if wxUSE_GUI m_topWindow = (wxWindow *)NULL; @@ -59,6 +94,15 @@ wxAppBase::wxAppBase() m_exitOnFrameDelete = TRUE; m_isActive = TRUE; #endif // wxUSE_GUI + +#ifdef __WXDEBUG__ + SetTraceMasks(); +#endif +} + +wxAppBase::~wxAppBase() +{ + // this destructor is required for Darwin } #if wxUSE_GUI @@ -67,6 +111,9 @@ bool wxAppBase::OnInitGui() #ifdef __WXUNIVERSAL__ if ( !wxTheme::Get() && !wxTheme::CreateDefault() ) return FALSE; + wxArtProvider *art = wxTheme::Get()->GetArtProvider(); + if ( art ) + wxArtProvider::PushProvider(art); #endif // __WXUNIVERSAL__ return TRUE; @@ -130,7 +177,15 @@ void wxAppBase::ProcessPendingEvents() void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus)) { + if ( active == m_isActive ) + return; + m_isActive = active; + + wxActivateEvent event(wxEVT_ACTIVATE_APP, active); + event.SetEventObject(this); + + (void)ProcessEvent(event); } #endif // wxUSE_GUI @@ -147,7 +202,7 @@ bool wxAppBase::OnInit() OnInitCmdLine(parser); bool cont; - switch ( parser.Parse() ) + switch ( parser.Parse(FALSE /* don't show usage */) ) { case -1: cont = OnCmdLineHelp(parser); @@ -173,6 +228,7 @@ bool wxAppBase::OnInit() #define OPTION_VERBOSE _T("verbose") #define OPTION_THEME _T("theme") +#define OPTION_MODE _T("mode") void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) { @@ -195,7 +251,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) OPTION_VERBOSE, gettext_noop("generate verbose log messages") }, -#endif wxUSE_LOG +#endif // wxUSE_LOG #ifdef __WXUNIVERSAL__ { @@ -207,6 +263,19 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) }, #endif // __WXUNIVERSAL__ +#if defined(__WXMGL__) + // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports + // should provide this option. That's why it is in common/appcmn.cpp + // and not mgl/app.cpp + { + wxCMD_LINE_OPTION, + _T(""), + OPTION_MODE, + gettext_noop("specify display mode to use (e.g. 640x480-16)"), + wxCMD_LINE_VAL_STRING + }, +#endif // __WXMGL__ + // terminator { wxCMD_LINE_NONE } }; @@ -239,6 +308,23 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) } #endif // __WXUNIVERSAL__ +#if defined(__WXMGL__) + wxString modeDesc; + if ( parser.Found(OPTION_MODE, &modeDesc) ) + { + unsigned w, h, bpp; + if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 ) + { + wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str()); + + return FALSE; + } + + if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) ) + return FALSE; + } +#endif // __WXMGL__ + return TRUE; } @@ -258,3 +344,151 @@ bool wxAppBase::OnCmdLineError(wxCmdLineParser& parser) #endif // wxUSE_CMDLINE_PARSER +// ---------------------------------------------------------------------------- +// debugging support +// ---------------------------------------------------------------------------- + +#ifdef __WXDEBUG__ + +// wxASSERT() helper +bool wxAssertIsEqual(int x, int y) +{ + return x == y; +} + +// break into the debugger +void wxTrap() +{ +#if defined(__WXMSW__) && !defined(__WXMICROWIN__) + DebugBreak(); +#elif defined(__WXMAC__) && !defined(__DARWIN__) +#if __powerc + Debugger(); +#else + SysBreak(); +#endif +#elif defined(__UNIX__) + raise(SIGTRAP); +#else + // TODO +#endif // Win/Unix +} + +// show the assert modal dialog +static +void ShowAssertDialog(const wxChar *szFile, int nLine, 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 + 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); + + if ( szMsg != NULL ) + { + wxStrcat(szBuf, wxT(": ")); + wxStrcat(szBuf, szMsg); + } + else // no message given + { + wxStrcat(szBuf, wxT(".")); + } + + if ( !s_bNoAsserts ) + { + // send it to the normal log destination + wxLogDebug(szBuf); + +#if (wxUSE_GUI && wxUSE_MSGDLG) || defined(__WXMSW__) + // this message is intentionally not translated - it is for + // developpers only + wxStrcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings.")); + + // use the native message box if available: this is more robust than + // using our own +#if defined(__WXMSW__) && !defined(__WXMICROWIN__) + switch ( ::MessageBox(NULL, szBuf, _T("Debug"), + MB_YESNOCANCEL | MB_ICONSTOP ) ) + { + case IDYES: + wxTrap(); + break; + + case IDCANCEL: + s_bNoAsserts = TRUE; + break; + + //case IDNO: nothing to do + } +#else // !MSW + switch ( wxMessageBox(szBuf, wxT("Debug"), + wxYES_NO | wxCANCEL | wxICON_STOP ) ) + { + case wxYES: + wxTrap(); + break; + + case wxCANCEL: + s_bNoAsserts = TRUE; + break; + + //case wxNO: nothing to do + } +#endif // GUI or MSW + +#else // !GUI + wxTrap(); +#endif // GUI/!GUI + } +} + +// this function is called when an assert fails +void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg) +{ + // FIXME MT-unsafe + static bool s_bInAssert = FALSE; + + if ( s_bInAssert ) + { + // He-e-e-e-elp!! we're trapped in endless loop + wxTrap(); + + s_bInAssert = FALSE; + + return; + } + + s_bInAssert = TRUE; + + if ( !wxTheApp ) + { + // by default, show the assert dialog box - we can't customize this + // behaviour + ShowAssertDialog(szFile, nLine, szMsg); + } + else + { + // let the app process it as it wants + wxTheApp->OnAssert(szFile, nLine, szMsg); + } + + s_bInAssert = FALSE; +} + +void wxAppBase::OnAssert(const wxChar *file, int line, const wxChar *msg) +{ + ShowAssertDialog(file, line, msg); +} + +#endif //WXDEBUG +