X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e570a44b372cf56526c128eab646615fa59520fc..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/basemsw.cpp?ds=sidebyside diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp index 8ec6130a51..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 @@ -35,6 +37,17 @@ #include "wx/msw/private.h" +// ============================================================================ +// wxAppTraits implementation +// ============================================================================ + +GSocketManager *wxAppTraits::ms_manager = NULL; + +WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread) +{ + return ::WaitForSingleObject((HANDLE)hThread, INFINITE); +} + // ============================================================================ // wxConsoleAppTraits implementation // ============================================================================ @@ -71,8 +84,27 @@ 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 ::WaitForSingleObject((HANDLE)hThread, INFINITE); + return DoSimpleWaitForThread(hThread); }