X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/535920ff9337a31829ab1618a199752c49bff402..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/msw/basemsw.cpp diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp index 47a9aac846..5308abebe3 100644 --- a/src/msw/basemsw.cpp +++ b/src/msw/basemsw.cpp @@ -28,6 +28,8 @@ #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 @@ -39,6 +41,8 @@ // wxAppTraits implementation // ============================================================================ +GSocketManager *wxAppTraits::ms_manager = NULL; + WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread) { return ::WaitForSingleObject((HANDLE)hThread, INFINITE); @@ -80,6 +84,25 @@ bool wxConsoleAppTraits::DoMessageFromThreadWait() return true; } +#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);