/////////////////////////////////////////////////////////////////////////////
-// Name: common/appcmn.cpp
+// Name: src/common/appcmn.cpp
// Purpose: wxAppBase methods common to all platforms
// Author: Vadim Zeitlin
// Modified by:
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "appbase.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/intl.h"
- #include "wx/list.h"
- #if wxUSE_LOG
- #include "wx/log.h"
- #endif // wxUSE_LOG
- #if wxUSE_GUI
- #include "wx/msgdlg.h"
- #endif // wxUSE_GUI
+ #include "wx/window.h"
+ #include "wx/bitmap.h"
+ #include "wx/log.h"
+ #include "wx/msgdlg.h"
+ #include "wx/confbase.h"
+ #include "wx/utils.h"
+ #include "wx/wxcrtvararg.h"
#endif
+#include "wx/apptrait.h"
#include "wx/cmdline.h"
-#include "wx/thread.h"
-#include "wx/confbase.h"
-#include "wx/tokenzr.h"
-#include "wx/utils.h"
#include "wx/msgout.h"
+#include "wx/thread.h"
+#include "wx/vidmode.h"
+#include "wx/evtloop.h"
-#if wxUSE_GUI
- #include "wx/artprov.h"
-#endif // wxUSE_GUI
-
-#if !defined(__WXMSW__) || defined(__WXMICROWIN__)
- #include <signal.h> // for SIGTRAP used by wxTrap()
-#endif //Win/Unix
-
-#if defined(__WXMSW__)
- #include "wx/msw/private.h" // includes windows.h for MessageBox()
-#endif
+#if wxUSE_FONTMAP
+ #include "wx/fontmap.h"
+#endif // wxUSE_FONTMAP
-#if defined(__WXMAC__)
- #include "wx/mac/private.h" // includes mac headers
-#endif
+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxCore")
-// private functions prototypes
-#ifdef __WXDEBUG__
- static void LINKAGEMODE SetTraceMasks();
-#endif // __WXDEBUG__
-
-// ===========================================================================
-// implementation
-// ===========================================================================
+// ============================================================================
+// wxAppBase implementation
+// ============================================================================
// ----------------------------------------------------------------------------
-// initialization and termination
+// initialization
// ----------------------------------------------------------------------------
wxAppBase::wxAppBase()
{
- wxTheApp = (wxApp *)this;
+ m_topWindow = NULL;
-#if WXWIN_COMPATIBILITY_2_2
- m_wantDebugOutput = FALSE;
-#endif // WXWIN_COMPATIBILITY_2_2
+ m_useBestVisual = false;
+ m_forceTrueColour = false;
-#if wxUSE_GUI
- m_topWindow = (wxWindow *)NULL;
- m_useBestVisual = FALSE;
- m_isActive = 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
// 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().
+ // 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
+ // 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__
- SetTraceMasks();
-#endif
}
-wxAppBase::~wxAppBase()
+bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
{
- // this destructor is required for Darwin
-}
+ if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )
+ return false;
-#if wxUSE_GUI
+ wxInitializeStockLists();
-bool wxAppBase::OnInitGui()
-{
-#ifdef __WXUNIVERSAL__
- if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
- return FALSE;
- wxArtProvider *art = wxTheme::Get()->GetArtProvider();
- if ( art )
- wxArtProvider::PushProvider(art);
-#endif // __WXUNIVERSAL__
+ wxBitmap::InitStandardHandlers();
- return TRUE;
-}
+ // for compatibility call the old initialization function too
+ if ( !OnInitGui() )
+ return false;
-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();
-}
-
-#endif // wxUSE_GUI
-
-int wxAppBase::OnExit()
-{
-#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
-
-#ifdef __WXUNIVERSAL__
- delete wxTheme::Set(NULL);
-#endif // __WXUNIVERSAL__
-
- // use Set(NULL) and not Get() to avoid creating a message output object on
- // demand when we just want to delete it
- delete wxMessageOutput::Set(NULL);
-
- return 0;
+ return true;
}
// ----------------------------------------------------------------------------
-// customization hooks
+// cleanup
// ----------------------------------------------------------------------------
-#if wxUSE_LOG
-
-wxLog *wxAppBase::CreateLogTarget()
-{
-#if wxUSE_GUI && wxUSE_LOGGUI && !defined(__WXMICROWIN__)
- return new wxLogGui;
-#else // !GUI
- return new wxLogStderr;
-#endif // wxUSE_GUI
-}
-
-#endif // wxUSE_LOG
-
-wxMessageOutput *wxAppBase::CreateMessageOutput()
+wxAppBase::~wxAppBase()
{
- // 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__)
- // wxMessageOutputMessageBox doesn't work under Motif
- #ifdef __WXMOTIF__
- return new wxMessageOutputLog;
- #else
- return new wxMessageOutputMessageBox;
- #endif
-#else // !wxUSE_GUI || __UNIX__
- return new wxMessageOutputStderr;
-#endif
+ // this destructor is required for Darwin
}
-// ---------------------------------------------------------------------------
-// wxAppBase
-// ----------------------------------------------------------------------------
-
-void wxAppBase::ProcessPendingEvents()
+void wxAppBase::CleanUp()
{
- // ensure that we're the only thread to modify the pending events list
- wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+ // clean up all the pending objects
+ DeletePendingObjects();
- if ( !wxPendingEvents )
+ // and any remaining TLWs (they remove themselves from wxTopLevelWindows
+ // when destroyed, so iterate until none are left)
+ while ( !wxTopLevelWindows.empty() )
{
- wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
- return;
+ // do not use Destroy() here as it only puts the TLW in pending list
+ // but we want to delete them now
+ delete wxTopLevelWindows.GetFirst()->GetData();
}
- // iterate until the list becomes empty
- wxNode *node = wxPendingEvents->First();
- while (node)
- {
- wxEvtHandler *handler = (wxEvtHandler *)node->Data();
- delete node;
+ // undo everything we did in Initialize() above
+ wxBitmap::CleanUpHandlers();
- // 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 );
+ wxStockGDI::DeleteAll();
- node = wxPendingEvents->First();
- }
+ wxDeleteStockLists();
+
+ wxDELETE(wxTheColourDatabase);
- wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+ wxAppConsole::CleanUp();
}
// ----------------------------------------------------------------------------
-// misc
+// various accessors
// ----------------------------------------------------------------------------
-#if wxUSE_GUI
-
-void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
+wxWindow* wxAppBase::GetTopWindow() const
{
- if ( active == m_isActive )
- return;
-
- m_isActive = active;
-
- wxActivateEvent event(wxEVT_ACTIVATE_APP, active);
- event.SetEventObject(this);
-
- (void)ProcessEvent(event);
+ wxWindow* window = m_topWindow;
+ if (window == NULL && wxTopLevelWindows.GetCount() > 0)
+ window = wxTopLevelWindows.GetFirst()->GetData();
+ return window;
}
-#endif // wxUSE_GUI
-
-int wxAppBase::FilterEvent(wxEvent& WXUNUSED(event))
+wxVideoMode wxAppBase::GetDisplayMode() const
{
- // process the events normally by default
- return -1;
+ return wxVideoMode();
}
-// ----------------------------------------------------------------------------
-// cmd line parsing
-// ----------------------------------------------------------------------------
-
-bool wxAppBase::OnInit()
+wxLayoutDirection wxAppBase::GetLayoutDirection() const
{
-#if wxUSE_CMDLINE_PARSER
- wxCmdLineParser parser(argc, argv);
-
- OnInitCmdLine(parser);
-
- bool cont;
- switch ( parser.Parse(FALSE /* don't show usage */) )
+#if wxUSE_INTL
+ const wxLocale *const locale = wxGetLocale();
+ if ( locale )
{
- case -1:
- cont = OnCmdLineHelp(parser);
- break;
+ const wxLanguageInfo *const
+ info = wxLocale::GetLanguageInfo(locale->GetLanguage());
- case 0:
- cont = OnCmdLineParsed(parser);
- break;
-
- default:
- cont = OnCmdLineError(parser);
- break;
+ if ( info )
+ return info->LayoutDirection;
}
+#endif // wxUSE_INTL
- if ( !cont )
- return FALSE;
-#endif // wxUSE_CMDLINE_PARSER
-
- return TRUE;
+ // we don't know
+ return wxLayout_Default;
}
#if wxUSE_CMDLINE_PARSER
-#define OPTION_VERBOSE _T("verbose")
-#define OPTION_THEME _T("theme")
-#define OPTION_MODE _T("mode")
+// ----------------------------------------------------------------------------
+// GUI-specific command line options handling
+// ----------------------------------------------------------------------------
+
+#define OPTION_THEME "theme"
+#define OPTION_MODE "mode"
void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
{
+ // first add the standard non GUI options
+ wxAppConsole::OnInitCmdLine(parser);
+
// the standard command line options
- static const wxCmdLineEntryDesc cmdLineDesc[] =
+ static const wxCmdLineEntryDesc cmdLineGUIDesc[] =
{
- {
- 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"),
- wxCMD_LINE_VAL_NONE,
- 0x0
- },
-#endif // wxUSE_LOG
-
#ifdef __WXUNIVERSAL__
{
wxCMD_LINE_OPTION,
- _T(""),
+ NULL,
OPTION_THEME,
gettext_noop("specify the theme to use"),
wxCMD_LINE_VAL_STRING,
},
#endif // __WXUNIVERSAL__
-#if defined(__WXMGL__)
- // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports
+#if defined(__WXDFB__)
+ // VS: this is not specific to wxDFB, all fullscreen (framebuffer) ports
// should provide this option. That's why it is in common/appcmn.cpp
- // and not mgl/app.cpp
+ // and not dfb/app.cpp
{
wxCMD_LINE_OPTION,
- _T(""),
+ NULL,
OPTION_MODE,
gettext_noop("specify display mode to use (e.g. 640x480-16)"),
wxCMD_LINE_VAL_STRING,
0x0
},
-#endif // __WXMGL__
+#endif // __WXDFB__
// terminator
- {
- wxCMD_LINE_NONE,
- _T(""),
- _T(""),
- _T(""),
- wxCMD_LINE_VAL_NONE,
- 0x0
- }
+ wxCMD_LINE_DESC_END
};
- parser.SetDesc(cmdLineDesc);
+ parser.SetDesc(cmdLineGUIDesc);
}
bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
{
-#if wxUSE_LOG
- if ( parser.Found(OPTION_VERBOSE) )
- {
- wxLog::SetVerbose(TRUE);
- }
-#endif // wxUSE_LOG
-
#ifdef __WXUNIVERSAL__
wxString themeName;
if ( parser.Found(OPTION_THEME, &themeName) )
if ( !theme )
{
wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
-
- return FALSE;
+ return false;
}
+ // Delete the defaultly created theme and set the new theme.
+ delete wxTheme::Get();
wxTheme::Set(theme);
}
#endif // __WXUNIVERSAL__
-#if defined(__WXMGL__)
+#if defined(__WXDFB__)
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 )
+ if ( wxSscanf(modeDesc.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3 )
{
wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
-
- return FALSE;
+ return false;
}
- if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
- return FALSE;
+ if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
+ return false;
}
-#endif // __WXMGL__
+#endif // __WXDFB__
- return TRUE;
+ return wxAppConsole::OnCmdLineParsed(parser);
}
-bool wxAppBase::OnCmdLineHelp(wxCmdLineParser& parser)
+#endif // wxUSE_CMDLINE_PARSER
+
+// ----------------------------------------------------------------------------
+// OnXXX() hooks
+// ----------------------------------------------------------------------------
+
+bool wxAppBase::OnInitGui()
{
- parser.Usage();
+#ifdef __WXUNIVERSAL__
+ if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
+ return false;
+#endif // __WXUNIVERSAL__
- return FALSE;
+ return true;
}
-bool wxAppBase::OnCmdLineError(wxCmdLineParser& parser)
+int wxAppBase::OnRun()
{
- parser.Usage();
+ // 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 FALSE;
+ return wxAppConsole::OnRun();
}
-#endif // wxUSE_CMDLINE_PARSER
+int wxAppBase::OnExit()
+{
+#ifdef __WXUNIVERSAL__
+ delete wxTheme::Set(NULL);
+#endif // __WXUNIVERSAL__
+
+ return wxAppConsole::OnExit();
+}
+
+wxAppTraits *wxAppBase::CreateTraits()
+{
+ return new wxGUIAppTraits;
+}
// ----------------------------------------------------------------------------
-// debugging support
+// misc
// ----------------------------------------------------------------------------
-/* static */
-bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
+void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
{
-#define wxCMP(what) (what == opts.m_ ## what)
+ if ( active == m_isActive )
+ return;
- bool
-#ifdef __WXDEBUG__
- isDebug = TRUE;
-#else
- isDebug = FALSE;
-#endif
+ m_isActive = active;
- int verMaj = wxMAJOR_VERSION,
- verMin = wxMINOR_VERSION;
+ wxActivateEvent event(wxEVT_ACTIVATE_APP, active);
+ event.SetEventObject(this);
- if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
- {
- wxLogFatalError(_T("Mismatch between the program and library build ")
- _T("versions detected."));
+ (void)ProcessEvent(event);
+}
- // normally wxLogFatalError doesn't return
- return FALSE;
- }
-#undef wxCMP
+bool wxAppBase::SafeYield(wxWindow *win, bool onlyIfNeeded)
+{
+ wxWindowDisabler wd(win);
+
+ wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
- return TRUE;
+ return loop && loop->Yield(onlyIfNeeded);
}
-#ifdef __WXDEBUG__
+bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess)
+{
+ wxWindowDisabler wd(win);
+
+ wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+ return loop && loop->YieldFor(eventsToProcess);
+}
+
+
+// ----------------------------------------------------------------------------
+// idle handling
+// ----------------------------------------------------------------------------
-static void LINKAGEMODE SetTraceMasks()
+// Returns true if more time is needed.
+bool wxAppBase::ProcessIdle()
{
- wxString mask;
- if ( wxGetEnv(wxT("WXTRACE"), &mask) )
+ // call the base class version first to send the idle event to wxTheApp
+ // itself
+ bool needMore = wxAppConsoleBase::ProcessIdle();
+ wxIdleEvent event;
+ wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+ while (node)
{
- wxStringTokenizer tkn(mask, wxT(","));
- while ( tkn.HasMoreTokens() )
- wxLog::AddTraceMask(tkn.GetNextToken());
+ wxWindow* win = node->GetData();
+
+ // Don't send idle events to the windows that are about to be destroyed
+ // anyhow, this is wasteful and unexpected.
+ if ( !wxPendingDelete.Member(win) && win->SendIdleEvents(event) )
+ needMore = true;
+ node = node->GetNext();
}
-}
-// wxASSERT() helper
-bool wxAssertIsEqual(int x, int y)
-{
- return x == y;
+ wxUpdateUIEvent::ResetUpdateTime();
+
+ return needMore;
}
-// break into the debugger
-void wxTrap()
+// ----------------------------------------------------------------------------
+// wxGUIAppTraitsBase
+// ----------------------------------------------------------------------------
+
+#if wxUSE_LOG
+
+wxLog *wxGUIAppTraitsBase::CreateLogTarget()
{
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
- DebugBreak();
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-#if __powerc
- Debugger();
+#if wxUSE_LOGGUI
+#ifndef __WXOSX_IPHONE__
+ return new wxLogGui;
#else
- SysBreak();
+ return new wxLogStderr;
#endif
-#elif defined(__UNIX__)
- raise(SIGTRAP);
#else
- // TODO
-#endif // Win/Unix
+ // we must have something!
+ return new wxLogStderr;
+#endif
}
+#endif // wxUSE_LOG
-void wxAssert(int cond,
- const wxChar *szFile,
- int nLine,
- const wxChar *szCond,
- const wxChar *szMsg)
+wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput()
{
- if ( !cond )
- wxOnAssert(szFile, nLine, szCond, szMsg);
+ // 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 (!)
+ // stderr if available and message box otherwise on others
+ // (currently stderr only Windows if app running from console)
+#ifdef __UNIX__
+ return new wxMessageOutputStderr;
+#else // !__UNIX__
+ // wxMessageOutputMessageBox doesn't work under Motif
+ #ifdef __WXMOTIF__
+ return new wxMessageOutputLog;
+ #elif wxUSE_MSGDLG
+ return new wxMessageOutputBest(wxMSGOUT_PREFER_STDERR);
+ #else
+ return new wxMessageOutputStderr;
+ #endif
+#endif // __UNIX__/!__UNIX__
}
-
-// show the assert modal dialog
-static
-void ShowAssertDialog(const wxChar *szFile,
- int nLine,
- const wxChar *szCond,
- const wxChar *szMsg)
+
+#if wxUSE_FONTMAP
+
+wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper()
{
- // this variable can be set to true to suppress "assert failure" messages
- static bool s_bNoAsserts = FALSE;
+ return new wxFontMapper;
+}
- wxChar szBuf[4096];
+#endif // wxUSE_FONTMAP
- // 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),
- wxT("%s(%d): assert \"%s\" failed"),
- szFile, nLine, szCond);
+wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
+{
+ // use the default native renderer by default
+ return NULL;
+}
- if ( szMsg != NULL )
- {
- wxStrcat(szBuf, wxT(": "));
- wxStrcat(szBuf, szMsg);
- }
- else // no message given
- {
- wxStrcat(szBuf, wxT("."));
- }
+bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
+{
+#if wxDEBUG_LEVEL
+ // 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()
+ //
+ // under DFB the message dialog is not always functional right now
+ //
+ // and finally we can't use wxMessageBox() if it wasn't compiled in, of
+ // course
+#if !defined(__WXMSW__) && !defined(__WXDFB__) && wxUSE_MSGDLG
- if ( !s_bNoAsserts )
+ // we can't (safely) show the GUI dialog from another thread, only do it
+ // for the asserts in the main thread
+ if ( wxIsMainThread() )
{
- // 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."));
+ wxString msgDlg = msg;
- // 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;
+#if wxUSE_STACKWALKER
+ const wxString stackTrace = GetAssertStackTrace();
+ if ( !stackTrace.empty() )
+ msgDlg << wxT("\n\nCall stack:\n") << stackTrace;
+#endif // wxUSE_STACKWALKER
- case IDCANCEL:
- s_bNoAsserts = TRUE;
- break;
+ // this message is intentionally not translated -- it is for
+ // developpers only
+ msgDlg += wxT("\nDo you want to stop the program?\n")
+ wxT("You can also choose [Cancel] to suppress ")
+ wxT("further warnings.");
- //case IDNO: nothing to do
- }
-#else // !MSW
- switch ( wxMessageBox(szBuf, wxT("Debug"),
+ switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
wxYES_NO | wxCANCEL | wxICON_STOP ) )
{
case wxYES:
break;
case wxCANCEL:
- s_bNoAsserts = TRUE;
- break;
+ // no more asserts
+ return true;
//case wxNO: nothing to do
}
-#endif // GUI or MSW
-#else // !GUI
- wxTrap();
-#endif // GUI/!GUI
+ return false;
}
-}
+#endif // wxUSE_MSGDLG
+#endif // wxDEBUG_LEVEL
-// this function is called when an assert fails
-void wxOnAssert(const wxChar *szFile,
- int nLine,
- const wxChar *szCond,
- 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, szCond, szMsg);
- }
- else
- {
- // let the app process it as it wants
- wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);
- }
-
- s_bInAssert = FALSE;
+ return wxAppTraitsBase::ShowAssertDialog(msg);
}
-void wxAppBase::OnAssert(const wxChar *file,
- int line,
- const wxChar *cond,
- const wxChar *msg)
+bool wxGUIAppTraitsBase::HasStderr()
{
- ShowAssertDialog(file, line, cond, msg);
+ // 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
}
-#endif //WXDEBUG
-
projects / wxWidgets.git / blobdiff