X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b46b1d59d6f69ad80dcf5955375578a6504d100a..b4607e897c31cd59c5ede98c3b5b5d3910902930:/src/msw/basemsw.cpp diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp index 1989549dc1..ba07b70914 100644 --- a/src/msw/basemsw.cpp +++ b/src/msw/basemsw.cpp @@ -6,7 +6,7 @@ // Created: 22.06.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -25,6 +25,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/event.h" #endif //WX_PRECOMP #include "wx/apptrait.h" @@ -35,6 +36,7 @@ // wxBase.dll, and MSVC 5 will give linker errors #include "wx/recguard.h" +#include "wx/crt.h" #include "wx/msw/private.h" // ============================================================================ @@ -50,21 +52,6 @@ WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread) // wxConsoleAppTraits implementation // ============================================================================ -void wxConsoleAppTraits::AlwaysYield() -{ - // we need to use special logic to deal with WM_PAINT: as this pseudo - // message is generated automatically as long as there are invalidated - // windows belonging to this thread, we'd never return if we waited here - // until we have no more of them left. OTOH, this message is always the - // last one in the queue, so we can safely return as soon as we detect it - MSG msg; - while ( ::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) ) - { - if ( msg.message == WM_PAINT ) - break; - } -} - void *wxConsoleAppTraits::BeforeChildWaitLoop() { // nothing to do here @@ -82,18 +69,31 @@ bool wxConsoleAppTraits::DoMessageFromThreadWait() return true; } +#if wxUSE_TIMER + wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer) { return new wxMSWTimerImpl(timer); } -wxEventLoop *wxConsoleAppTraits::CreateEventLoop() +#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; +}