X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6e6fcc922ec529e761feb6b52cf01f9db934e79..3c0f8ed2509f8b6e806af093f1b5041c61649da1:/src/common/appcmn.cpp?ds=inline diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 05d7cb3bfe..cf61da7e89 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 +// Name: src/common/appcmn.cpp +// Purpose: wxAppConsole and wxAppBase methods common to all platforms // Author: Vadim Zeitlin // Modified by: // Created: 18.10.99 @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "appbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,227 +26,184 @@ #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/intl.h" - #include "wx/list.h" - #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/msgout.h" #include "wx/thread.h" -#include "wx/confbase.h" -#include "wx/tokenzr.h" -#include "wx/utils.h" +#include "wx/vidmode.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 +#ifdef __WXDEBUG__ + #if wxUSE_STACKWALKER + #include "wx/stackwalk.h" + #endif // wxUSE_STACKWALKER +#endif // __WXDEBUG__ #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") + +WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete; -// =========================================================================== -// implementation -// =========================================================================== +// ============================================================================ +// wxAppBase implementation +// ============================================================================ // ---------------------------------------------------------------------------- -// initialization and termination +// initialization // ---------------------------------------------------------------------------- wxAppBase::wxAppBase() { - wxTheApp = (wxApp *)this; - -#if WXWIN_COMPATIBILITY_2_2 - m_wantDebugOutput = FALSE; -#endif // WXWIN_COMPATIBILITY_2_2 - -#if wxUSE_GUI m_topWindow = (wxWindow *)NULL; - m_useBestVisual = FALSE; - m_exitOnFrameDelete = TRUE; - m_isActive = TRUE; -#endif // wxUSE_GUI -#ifdef __WXDEBUG__ - SetTraceMasks(); -#endif -} - -wxAppBase::~wxAppBase() -{ - // this destructor is required for Darwin + m_useBestVisual = false; + m_forceTrueColour = false; + + 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; } -#if wxUSE_GUI -bool wxAppBase::OnInitGui() +bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig) { -#ifdef __WXUNIVERSAL__ - if ( !wxTheme::Get() && !wxTheme::CreateDefault() ) - return FALSE; - wxArtProvider *art = wxTheme::Get()->GetArtProvider(); - if ( art ) - wxArtProvider::PushProvider(art); -#endif // __WXUNIVERSAL__ - - return TRUE; -} -#endif // wxUSE_GUI + if ( !wxAppConsole::Initialize(argcOrig, argvOrig) ) + return false; -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 + wxInitializeStockLists(); -#ifdef __WXUNIVERSAL__ - delete wxTheme::Set(NULL); -#endif // __WXUNIVERSAL__ + wxBitmap::InitStandardHandlers(); - return 0; + return true; } -// --------------------------------------------------------------------------- -// wxAppBase +// ---------------------------------------------------------------------------- +// cleanup // ---------------------------------------------------------------------------- -void wxAppBase::ProcessPendingEvents() +wxAppBase::~wxAppBase() { - // ensure that we're the only thread to modify the pending events list - wxENTER_CRIT_SECT( *wxPendingEventsLocker ); + // this destructor is required for Darwin +} - if ( !wxPendingEvents ) - { - wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); - return; - } +void wxAppBase::CleanUp() +{ + // clean up all the pending objects + DeletePendingObjects(); - // iterate until the list becomes empty - wxNode *node = wxPendingEvents->First(); - while (node) + // and any remaining TLWs (they remove themselves from wxTopLevelWindows + // when destroyed, so iterate until none are left) + while ( !wxTopLevelWindows.empty() ) { - wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - delete node; - - // 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 ); - - node = wxPendingEvents->First(); + // 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(); } - wxLEAVE_CRIT_SECT( *wxPendingEventsLocker ); -} + // undo everything we did in Initialize() above + wxBitmap::CleanUpHandlers(); -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- + wxStockGDI::DeleteAll(); -#if wxUSE_GUI + wxDeleteStockLists(); -void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus)) -{ - if ( active == m_isActive ) - return; + delete wxTheColourDatabase; + wxTheColourDatabase = NULL; - m_isActive = active; +#if wxUSE_THREADS + #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 - wxActivateEvent event(wxEVT_ACTIVATE_APP, active); - event.SetEventObject(this); - - (void)ProcessEvent(event); + wxAppConsole::CleanUp(); } -#endif // wxUSE_GUI - // ---------------------------------------------------------------------------- -// cmd line parsing +// various accessors // ---------------------------------------------------------------------------- -bool wxAppBase::OnInit() +wxWindow* wxAppBase::GetTopWindow() const { -#if wxUSE_CMDLINE_PARSER - wxCmdLineParser parser(argc, argv); + wxWindow* window = m_topWindow; + if (window == NULL && wxTopLevelWindows.GetCount() > 0) + window = wxTopLevelWindows.GetFirst()->GetData(); + return window; +} - OnInitCmdLine(parser); +wxVideoMode wxAppBase::GetDisplayMode() const +{ + return wxVideoMode(); +} - bool cont; - switch ( parser.Parse(FALSE /* don't show usage */) ) +wxLayoutDirection wxAppBase::GetLayoutDirection() const +{ +#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") +// ---------------------------------------------------------------------------- +// GUI-specific command line options handling +// ---------------------------------------------------------------------------- + #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, - _T(""), + wxEmptyString, OPTION_THEME, gettext_noop("specify the theme to use"), wxCMD_LINE_VAL_STRING, @@ -264,7 +217,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) // and not mgl/app.cpp { wxCMD_LINE_OPTION, - _T(""), + wxEmptyString, OPTION_MODE, gettext_noop("specify display mode to use (e.g. 640x480-16)"), wxCMD_LINE_VAL_STRING, @@ -275,26 +228,19 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) // terminator { wxCMD_LINE_NONE, - _T(""), - _T(""), - _T(""), + wxEmptyString, + wxEmptyString, + wxEmptyString, wxCMD_LINE_VAL_NONE, 0x0 } }; - 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) ) @@ -303,10 +249,11 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser) 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__ @@ -319,218 +266,318 @@ 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; + return false; } - if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) ) - return FALSE; + if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) ) + return false; } #endif // __WXMGL__ - 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__ -// ---------------------------------------------------------------------------- -// debugging support -// ---------------------------------------------------------------------------- + return wxAppConsole::OnExit(); +} -/* static */ -bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts) +wxAppTraits *wxAppBase::CreateTraits() { -#define wxCMP(what) (what == opts.m_ ## what) + return new wxGUIAppTraits; +} - bool -#ifdef __WXDEBUG__ - isDebug = TRUE; -#else - isDebug = FALSE; -#endif +// ---------------------------------------------------------------------------- +// misc +// ---------------------------------------------------------------------------- - int verMaj = wxMAJOR_VERSION, - verMin = wxMINOR_VERSION; +void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus)) +{ + if ( active == m_isActive ) + return; - if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) ) - { - wxLogFatalError(_T("Mismatch between the program and library build ") - _T("versions detected.")); + m_isActive = active; - // normally wxLogFatalError doesn't return - return FALSE; - } -#undef wxCMP + wxActivateEvent event(wxEVT_ACTIVATE_APP, active); + event.SetEventObject(this); - return TRUE; + (void)ProcessEvent(event); } -#ifdef __WXDEBUG__ +// ---------------------------------------------------------------------------- +// idle handling +// ---------------------------------------------------------------------------- -static void LINKAGEMODE SetTraceMasks() +void wxAppBase::DeletePendingObjects() { - wxString mask; - if ( wxGetEnv(wxT("WXTRACE"), &mask) ) + wxList::compatibility_iterator node = wxPendingDelete.GetFirst(); + while (node) { - wxStringTokenizer tkn(mask, wxT(",")); - while ( tkn.HasMoreTokens() ) - wxLog::AddTraceMask(tkn.GetNextToken()); + wxObject *obj = node->GetData(); + + // remove it from the list first so that if we get back here somehow + // during the object deletion (e.g. wxYield called from its dtor) we + // wouldn't try to delete it the second time + if ( wxPendingDelete.Member(obj) ) + wxPendingDelete.Erase(node); + + delete obj; + + // Deleting one object may have deleted other pending + // objects, so start from beginning of list again. + node = wxPendingDelete.GetFirst(); } } -// wxASSERT() helper -bool wxAssertIsEqual(int x, int y) +// Returns true if more time is needed. +bool wxAppBase::ProcessIdle() { - return x == y; -} + // process pending wx events before sending idle events + ProcessPendingEvents(); -// break into the debugger -void wxTrap() -{ -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) - DebugBreak(); -#elif defined(__WXMAC__) && !defined(__DARWIN__) -#if __powerc - Debugger(); -#else - SysBreak(); + wxIdleEvent event; + bool needMore = false; + wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); + while (node) + { + wxWindow* win = node->GetData(); + if (SendIdleEvents(win, event)) + needMore = true; + node = node->GetNext(); + } + + if (wxAppConsole::ProcessIdle()) + needMore = true; + + // 'Garbage' collection of windows deleted with Close(). + DeletePendingObjects(); + +#if wxUSE_LOG + // flush the logged messages if any + wxLog::FlushActive(); #endif -#elif defined(__UNIX__) - raise(SIGTRAP); -#else - // TODO -#endif // Win/Unix + + wxUpdateUIEvent::ResetUpdateTime(); + + return needMore; } -// show the assert modal dialog -static -void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg) +// Send idle event to window and all subwindows +bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) { - // 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 ) + bool needMore = false; + + win->OnInternalIdle(); + + // should we send idle event to this window? + if ( wxIdleEvent::GetMode() == wxIDLE_PROCESS_ALL || + win->HasExtraStyle(wxWS_EX_PROCESS_IDLE) ) { - wxStrcat(szBuf, wxT(": ")); - wxStrcat(szBuf, szMsg); + event.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(event); + + if (event.MoreRequested()) + needMore = true; } - else // no message given + wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); + while ( node ) { - wxStrcat(szBuf, wxT(".")); + wxWindow *child = node->GetData(); + if (SendIdleEvents(child, 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; + return needMore; +} - case IDCANCEL: - s_bNoAsserts = TRUE; - break; +// ---------------------------------------------------------------------------- +// wxGUIAppTraitsBase +// ---------------------------------------------------------------------------- - //case IDNO: nothing to do - } -#else // !MSW - switch ( wxMessageBox(szBuf, wxT("Debug"), - wxYES_NO | wxCANCEL | wxICON_STOP ) ) - { - case wxYES: - wxTrap(); - break; +#if wxUSE_LOG - case wxCANCEL: - s_bNoAsserts = TRUE; - break; +wxLog *wxGUIAppTraitsBase::CreateLogTarget() +{ +#if wxUSE_LOGGUI + return new wxLogGui; +#else + // we must have something! + return new wxLogStderr; +#endif +} - //case wxNO: nothing to do - } -#endif // GUI or MSW +#endif // wxUSE_LOG -#else // !GUI - wxTrap(); -#endif // GUI/!GUI - } +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; + #elif wxUSE_MSGDLG + return new wxMessageOutputMessageBox; + #else + return new wxMessageOutputStderr; + #endif +#endif // __UNIX__/!__UNIX__ +} + +#if wxUSE_FONTMAP + +wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper() +{ + return new wxFontMapper; } -// this function is called when an assert fails -void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg) +#endif // wxUSE_FONTMAP + +wxRendererNative *wxGUIAppTraitsBase::CreateRenderer() { - // FIXME MT-unsafe - static bool s_bInAssert = FALSE; + // use the default native renderer by default + return NULL; +} - if ( s_bInAssert ) +#ifdef __WXDEBUG__ + +bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg) +{ +#if defined(__WXMSW__) || !wxUSE_MSGDLG + // 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() + return wxAppTraitsBase::ShowAssertDialog(msg); +#else // wxUSE_MSGDLG + wxString msgDlg = msg; + +#if wxUSE_STACKWALKER + // on Unix stack frame generation may take some time, depending on the + // size of the executable mainly... warn the user that we are working + wxFprintf(stderr, wxT("[Debug] Generating a stack trace... please wait")); + fflush(stderr); + + const wxString stackTrace = GetAssertStackTrace(); + if ( !stackTrace.empty() ) + msgDlg << _T("\n\nCall stack:\n") << stackTrace; +#endif // wxUSE_STACKWALKER + + // 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."); + + switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"), + wxYES_NO | wxCANCEL | wxICON_STOP ) ) { - // He-e-e-e-elp!! we're trapped in endless loop - wxTrap(); + case wxYES: + wxTrap(); + break; - s_bInAssert = FALSE; + case wxCANCEL: + // no more asserts + return true; - return; + //case wxNO: nothing to do } - s_bInAssert = TRUE; + return false; +#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG +} - 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); - } +#endif // __WXDEBUG__ + +bool wxGUIAppTraitsBase::HasStderr() +{ + // 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 +} - s_bInAssert = FALSE; +void wxGUIAppTraitsBase::ScheduleForDestroy(wxObject *object) +{ + if ( !wxPendingDelete.Member(object) ) + wxPendingDelete.Append(object); } -void wxAppBase::OnAssert(const wxChar *file, int line, const wxChar *msg) +void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) { - ShowAssertDialog(file, line, msg); + wxPendingDelete.DeleteObject(object); } -#endif //WXDEBUG +#if wxUSE_SOCKETS + +#if defined(__WINDOWS__) + #include "wx/msw/gsockmsw.h" +#elif defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__) + #include "wx/unix/gsockunx.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() +{ +#if defined(__WXMAC__) && !defined(__DARWIN__) + // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and + // so it doesn't need this table at all + return NULL; +#else // !__WXMAC__ || __DARWIN__ + static GSocketGUIFunctionsTableConcrete table; + return &table; +#endif // !__WXMAC__ || __DARWIN__ +} +#endif