X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2ca375c5620209d77a88d2d378bdcdedbc82e7e..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/basemsw.cpp diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp index e033e2be88..5308abebe3 100644 --- a/src/msw/basemsw.cpp +++ b/src/msw/basemsw.cpp @@ -28,6 +28,7 @@ #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 @@ -40,6 +41,8 @@ // wxAppTraits implementation // ============================================================================ +GSocketManager *wxAppTraits::ms_manager = NULL; + WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread) { return ::WaitForSingleObject((HANDLE)hThread, INFINITE); @@ -81,12 +84,24 @@ 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) {