X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a69be60b0f1dac4713e6650ca3ca9fe5a53de062..783da8450c15fec48691411d492ad2246cba15d7:/src/common/appcmn.cpp diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 6177cbcc67..0f013b66d3 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 @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "appbase.h" #endif @@ -30,65 +30,61 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/bitmap.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/log.h" + #include "wx/msgdlg.h" + #include "wx/bitmap.h" + #include "wx/confbase.h" #endif +#include "wx/apptrait.h" #include "wx/cmdline.h" +#include "wx/evtloop.h" +#include "wx/msgout.h" #include "wx/thread.h" -#include "wx/confbase.h" -#include "wx/tokenzr.h" #include "wx/utils.h" -#include "wx/msgout.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 +#include "wx/ptr_scpd.h" #if defined(__WXMSW__) - #include "wx/msw/private.h" // includes windows.h for MessageBox() + #include "wx/msw/private.h" // includes windows.h for LOGFONT #endif -#if defined(__WXMAC__) - #include "wx/mac/private.h" // includes mac headers -#endif +#if wxUSE_FONTMAP + #include "wx/fontmap.h" +#endif // wxUSE_FONTMAP -// private functions prototypes -#ifdef __WXDEBUG__ - static void LINKAGEMODE SetTraceMasks(); -#endif // __WXDEBUG__ +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxCore") -// =========================================================================== -// implementation -// =========================================================================== // ---------------------------------------------------------------------------- -// initialization and termination +// wxEventLoopPtr // ---------------------------------------------------------------------------- -wxAppBase::wxAppBase() -{ - wxTheApp = (wxApp *)this; +// this defines wxEventLoopPtr +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop); -#if WXWIN_COMPATIBILITY_2_2 - m_wantDebugOutput = FALSE; -#endif // WXWIN_COMPATIBILITY_2_2 +// ============================================================================ +// wxAppBase implementation +// ============================================================================ -#if wxUSE_GUI +// ---------------------------------------------------------------------------- +// initialization +// ---------------------------------------------------------------------------- + +wxAppBase::wxAppBase() +{ m_topWindow = (wxWindow *)NULL; m_useBestVisual = FALSE; m_isActive = TRUE; +#if wxUSE_EVTLOOP_IN_APP + m_mainLoop = NULL; +#endif // wxUSE_EVTLOOP_IN_APP + // 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. @@ -102,229 +98,79 @@ wxAppBase::wxAppBase() // 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& argc, wxChar **argv) { - // this destructor is required for Darwin -} - -#if wxUSE_GUI + if ( !wxAppConsole::Initialize(argc, argv) ) + return false; -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; -} - -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 +#if wxUSE_THREADS + wxPendingEventsLocker = new wxCriticalSection; +#endif -#ifdef __WXUNIVERSAL__ - delete wxTheme::Set(NULL); -#endif // __WXUNIVERSAL__ + wxInitializeStockLists(); + wxInitializeStockObjects(); - // 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); + wxBitmap::InitStandardHandlers(); - 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 ); + // one last chance for pending objects to be cleaned up + DeletePendingObjects(); - if ( !wxPendingEvents ) - { - wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); - return; - } + wxBitmap::CleanUpHandlers(); - // iterate until the list becomes empty - wxNode *node = wxPendingEvents->First(); - while (node) - { - wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - delete node; + wxDeleteStockObjects(); - // 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 ); + wxDeleteStockLists(); - node = wxPendingEvents->First(); - } + delete wxTheColourDatabase; + wxTheColourDatabase = NULL; - wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); -} + delete wxPendingEvents; + wxPendingEvents = NULL; -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - -#if wxUSE_GUI +#if wxUSE_THREADS + delete wxPendingEventsLocker; + wxPendingEventsLocker = NULL; -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); + #if wxUSE_VALIDATORS + // If we don't do the following, we get an apparent memory leak. + ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); + #endif // wxUSE_VALIDATORS +#endif // wxUSE_THREADS } -#endif // wxUSE_GUI - -int wxAppBase::FilterEvent(wxEvent& WXUNUSED(event)) -{ - // process the events normally by default - return -1; -} +#if wxUSE_CMDLINE_PARSER // ---------------------------------------------------------------------------- -// cmd line parsing +// GUI-specific command line options handling // ---------------------------------------------------------------------------- -bool wxAppBase::OnInit() -{ -#if wxUSE_CMDLINE_PARSER - wxCmdLineParser parser(argc, argv); - - OnInitCmdLine(parser); - - bool cont; - switch ( parser.Parse(FALSE /* don't show usage */) ) - { - case -1: - cont = OnCmdLineHelp(parser); - break; - - case 0: - cont = OnCmdLineParsed(parser); - break; - - default: - cont = OnCmdLineError(parser); - break; - } - - if ( !cont ) - return FALSE; -#endif // wxUSE_CMDLINE_PARSER - - return TRUE; -} - -#if wxUSE_CMDLINE_PARSER - -#define OPTION_VERBOSE _T("verbose") #define OPTION_THEME _T("theme") #define OPTION_MODE _T("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, @@ -361,18 +207,11 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) } }; - 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) ) @@ -381,10 +220,11 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) if ( !theme ) { wxLogError(_("Unsupported theme '%s'."), themeName.c_str()); - return FALSE; } + // Delete the defaultly created theme and set the new theme. + delete wxTheme::Get(); wxTheme::Set(theme); } #endif // __WXUNIVERSAL__ @@ -397,7 +237,6 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 ) { wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str()); - return FALSE; } @@ -406,214 +245,365 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) } #endif // __WXMGL__ - return TRUE; + return wxAppConsole::OnCmdLineParsed(parser); } -bool wxAppBase::OnCmdLineHelp(wxCmdLineParser& parser) +#endif // wxUSE_CMDLINE_PARSER + +// ---------------------------------------------------------------------------- +// main event loop implementation +// ---------------------------------------------------------------------------- + +int wxAppBase::MainLoop() { - parser.Usage(); +#if wxUSE_EVTLOOP_IN_APP + wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop); - return FALSE; + return m_mainLoop->Run(); +#else // !wxUSE_EVTLOOP_IN_APP + return 0; +#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP } -bool wxAppBase::OnCmdLineError(wxCmdLineParser& parser) +void wxAppBase::ExitMainLoop() { - parser.Usage(); +#if wxUSE_EVTLOOP_IN_APP + // we should exit from the main event loop, not just any currently active + // (e.g. modal dialog) event loop + if ( m_mainLoop && m_mainLoop->IsRunning() ) + { + m_mainLoop->Exit(0); + } +#endif // wxUSE_EVTLOOP_IN_APP +} - return FALSE; +bool wxAppBase::Pending() +{ +#if wxUSE_EVTLOOP_IN_APP + // 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 + // main event loop is not running anyhow + wxEventLoop * const loop = wxEventLoop::GetActive(); + + return loop && loop->Pending(); +#else // wxUSE_EVTLOOP_IN_APP + return false; +#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP } -#endif // wxUSE_CMDLINE_PARSER +bool wxAppBase::Dispatch() +{ +#if wxUSE_EVTLOOP_IN_APP + // see comment in Pending() + wxEventLoop * const loop = wxEventLoop::GetActive(); + + return loop && loop->Dispatch(); +#else // wxUSE_EVTLOOP_IN_APP + return true; +#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP +} // ---------------------------------------------------------------------------- -// debugging support +// OnXXX() hooks // ---------------------------------------------------------------------------- -/* static */ -bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts) +bool wxAppBase::OnInitGui() { -#define wxCMP(what) (what == opts.m_ ## what) - - bool -#ifdef __WXDEBUG__ - isDebug = TRUE; -#else - isDebug = FALSE; -#endif - - int verMaj = wxMAJOR_VERSION, - verMin = wxMINOR_VERSION; - - if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) ) - { - wxLogFatalError(_T("Mismatch between the program and library build ") - _T("versions detected.")); - - // normally wxLogFatalError doesn't return +#ifdef __WXUNIVERSAL__ + if ( !wxTheme::Get() && !wxTheme::CreateDefault() ) return FALSE; - } -#undef wxCMP +#endif // __WXUNIVERSAL__ return TRUE; } -#ifdef __WXDEBUG__ - -static void LINKAGEMODE SetTraceMasks() +int wxAppBase::OnRun() { - wxString mask; - if ( wxGetEnv(wxT("WXTRACE"), &mask) ) + // see the comment in ctor: if the initial value hasn't been changed, use + // the default Yes from now on + if ( m_exitOnFrameDelete == Later ) { - wxStringTokenizer tkn(mask, wxT(",")); - while ( tkn.HasMoreTokens() ) - wxLog::AddTraceMask(tkn.GetNextToken()); + m_exitOnFrameDelete = Yes; } + //else: it has been changed, assume the user knows what he is doing + + return MainLoop(); +} + +int wxAppBase::OnExit() +{ +#ifdef __WXUNIVERSAL__ + delete wxTheme::Set(NULL); +#endif // __WXUNIVERSAL__ + + return wxAppConsole::OnExit(); } -// wxASSERT() helper -bool wxAssertIsEqual(int x, int y) +void wxAppBase::Exit() { - return x == y; + ExitMainLoop(); } -// break into the debugger -void wxTrap() +wxAppTraits *wxAppBase::CreateTraits() { -#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 + return new wxGUIAppTraits; } -// show the assert modal dialog -static -void ShowAssertDialog(const wxChar *szFile, - int nLine, - const wxChar *szCond, - const wxChar *szMsg) +// ---------------------------------------------------------------------------- +// misc +// ---------------------------------------------------------------------------- + +void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus)) { - // this variable can be set to true to suppress "assert failure" messages - static bool s_bNoAsserts = FALSE; + if ( active == m_isActive ) + return; - wxChar szBuf[4096]; + m_isActive = active; - // 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); + wxActivateEvent event(wxEVT_ACTIVATE_APP, active); + event.SetEventObject(this); - if ( szMsg != NULL ) + (void)ProcessEvent(event); +} + +void wxAppBase::DeletePendingObjects() +{ + wxList::compatibility_iterator node = wxPendingDelete.GetFirst(); + while (node) { - wxStrcat(szBuf, wxT(": ")); - wxStrcat(szBuf, szMsg); + wxObject *obj = node->GetData(); + + delete obj; + + if (wxPendingDelete.Member(obj)) + wxPendingDelete.Erase(node); + + // Deleting one object may have deleted other pending + // objects, so start from beginning of list again. + node = wxPendingDelete.GetFirst(); } - else // no message given +} + +// Returns TRUE if more time is needed. +bool wxAppBase::ProcessIdle() +{ + wxIdleEvent event; + bool needMore = FALSE; + wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); + while (node) { - wxStrcat(szBuf, wxT(".")); + wxWindow* win = node->GetData(); + if (SendIdleEvents(win, event)) + needMore = TRUE; + node = node->GetNext(); } - 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; + event.SetEventObject(this); + (void) ProcessEvent(event); + if (event.MoreRequested()) + needMore = TRUE; - case IDCANCEL: - s_bNoAsserts = TRUE; - break; + wxUpdateUIEvent::ResetUpdateTime(); + + return needMore; +} - //case IDNO: nothing to do - } -#else // !MSW - switch ( wxMessageBox(szBuf, wxT("Debug"), - wxYES_NO | wxCANCEL | wxICON_STOP ) ) - { - case wxYES: - wxTrap(); - break; +// Send idle event to window and all subwindows +bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) +{ + bool needMore = FALSE; - case wxCANCEL: - s_bNoAsserts = TRUE; - break; + win->OnInternalIdle(); - //case wxNO: nothing to do - } -#endif // GUI or MSW + if (wxIdleEvent::CanSend(win)) + { + event.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(event); + + if (event.MoreRequested()) + needMore = TRUE; + } + wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); + while ( node ) + { + wxWindow *child = node->GetData(); + if (SendIdleEvents(child, event)) + needMore = TRUE; -#else // !GUI - wxTrap(); -#endif // GUI/!GUI + node = node->GetNext(); } + + return needMore; } -// this function is called when an assert fails -void wxOnAssert(const wxChar *szFile, - int nLine, - const wxChar *szCond, - const wxChar *szMsg) +void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event)) { - // FIXME MT-unsafe - static bool s_bInAssert = FALSE; + // If there are pending events, we must process them: pending events + // are either events to the threads other than main or events posted + // with wxPostEvent() functions + // GRG: I have moved this here so that all pending events are processed + // before starting to delete any objects. This behaves better (in + // particular, wrt wxPostEvent) and is coherent with wxGTK's current + // behaviour. Changed Feb/2000 before 2.1.14 + ProcessPendingEvents(); + + // 'Garbage' collection of windows deleted with Close(). + DeletePendingObjects(); - if ( s_bInAssert ) - { - // He-e-e-e-elp!! we're trapped in endless loop - wxTrap(); +#if wxUSE_LOG + // flush the logged messages if any + wxLog::FlushActive(); +#endif // wxUSE_LOG - s_bInAssert = FALSE; +} - return; - } +// ---------------------------------------------------------------------------- +// wxGUIAppTraitsBase +// ---------------------------------------------------------------------------- - s_bInAssert = TRUE; +#if wxUSE_LOG - if ( !wxTheApp ) - { - // by default, show the assert dialog box - we can't customize this - // behaviour - ShowAssertDialog(szFile, nLine, szCond, szMsg); - } - else +wxLog *wxGUIAppTraitsBase::CreateLogTarget() +{ + return new wxLogGui; +} + +#endif // wxUSE_LOG + +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 + +wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper() +{ + return new wxFontMapper; +} + +#endif // wxUSE_FONTMAP + +wxRendererNative *wxGUIAppTraitsBase::CreateRenderer() +{ + // use the default native renderer by default + return NULL; +} + +#ifdef __WXDEBUG__ + +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 ) ) { - // let the app process it as it wants - wxTheApp->OnAssert(szFile, nLine, szCond, szMsg); + case wxYES: + wxTrap(); + break; + + case wxCANCEL: + // no more asserts + return true; + + //case wxNO: nothing to do } - s_bInAssert = FALSE; + return false; +#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG } -void wxAppBase::OnAssert(const wxChar *file, - int line, - const wxChar *cond, - const wxChar *msg) +#endif // __WXDEBUG__ + +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 +void wxGUIAppTraitsBase::ScheduleForDestroy(wxObject *object) +{ + if ( !wxPendingDelete.Member(object) ) + wxPendingDelete.Append(object); +} + +void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) +{ + wxPendingDelete.DeleteObject(object); +} + +#if wxUSE_SOCKETS + +#if defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__) + #include "wx/unix/gsockunx.h" +#elif defined(__WINDOWS__) + #include "wx/msw/gsockmsw.h" +#elif defined(__WXMAC__) + #include + #define OTUNIXERRORS 1 + #include + #include + #include + + #include "wx/mac/gsockmac.h" +#else + #error "Must include correct GSocket header here" +#endif + +GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() +{ +#ifdef __WXMAC__ + // NB: wxMac does not have any GUI-specific functions in gsocket.c and + // so it doesn't need this table at all + return NULL; +#else // !__WXMAC__ + static GSocketGUIFunctionsTable table = + { + _GSocket_GUI_Init, + _GSocket_GUI_Cleanup, + _GSocket_GUI_Init_Socket, + _GSocket_GUI_Destroy_Socket, +#ifndef __WINDOWS__ + _GSocket_Install_Callback, + _GSocket_Uninstall_Callback, +#endif + _GSocket_Enable_Events, + _GSocket_Disable_Events + }; + return &table; +#endif // __WXMAC__/!__WXMAC__ +} + +#endif