X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2ca375c5620209d77a88d2d378bdcdedbc82e7e..96b2cbe8b39292fed91654ff0d1f4b1c16561acb:/src/msw/basemsw.cpp diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp index e033e2be88..5af350eb5a 100644 --- a/src/msw/basemsw.cpp +++ b/src/msw/basemsw.cpp @@ -28,18 +28,22 @@ #endif //WX_PRECOMP #include "wx/apptrait.h" +#include "wx/evtloop.h" #include "wx/msw/private/timer.h" // MBN: this is a workaround for MSVC 5: if it is not #included in // some wxBase file, wxRecursionGuard methods won't be exported from // wxBase.dll, and MSVC 5 will give linker errors #include "wx/recguard.h" +#include "wx/crt.h" #include "wx/msw/private.h" // ============================================================================ // wxAppTraits implementation // ============================================================================ +GSocketManager *wxAppTraits::ms_manager = NULL; + WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread) { return ::WaitForSingleObject((HANDLE)hThread, INFINITE); @@ -81,15 +85,31 @@ bool wxConsoleAppTraits::DoMessageFromThreadWait() return true; } -wxTimerImpl * -wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer) +#if wxUSE_TIMER + +wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer) { return new wxMSWTimerImpl(timer); } +#endif // wxUSE_TIMER + +wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop() +{ +#if wxUSE_CONSOLE_EVENTLOOP + return new wxEventLoop(); +#else // !wxUSE_CONSOLE_EVENTLOOP + return NULL; +#endif // wxUSE_CONSOLE_EVENTLOOP/!wxUSE_CONSOLE_EVENTLOOP +} + WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread) { return DoSimpleWaitForThread(hThread); } +bool wxConsoleAppTraits::WriteToStderr(const wxString& text) +{ + return wxFprintf(stderr, "%s", text) != -1; +}