X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abd694417a84479d6e994f088ac2e1d76327dae0..c81394808bf7efd84e4294e44a9a9a7b7f6dd8a9:/src/msw/basemsw.cpp diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp index 4981322259..67ab1674a6 100644 --- a/src/msw/basemsw.cpp +++ b/src/msw/basemsw.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/basemsw.cpp +// Name: src/msw/basemsw.cpp // Purpose: misc stuff only used in console applications under MSW // Author: Vadim Zeitlin // Modified by: // Created: 22.06.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -43,10 +43,12 @@ // wxAppTraits implementation // ============================================================================ +#if wxUSE_THREADS WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread) { return ::WaitForSingleObject((HANDLE)hThread, INFINITE); } +#endif // wxUSE_THREADS // ============================================================================ // wxConsoleAppTraits implementation @@ -63,12 +65,19 @@ void wxConsoleAppTraits::AfterChildWaitLoop(void * WXUNUSED(data)) // nothing to do here } +#if wxUSE_THREADS bool wxConsoleAppTraits::DoMessageFromThreadWait() { // nothing to process here return true; } +WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) +{ + return DoSimpleWaitForThread(hThread); +} +#endif // wxUSE_THREADS + #if wxUSE_TIMER wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer) @@ -88,11 +97,6 @@ wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop() } -WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread) -{ - return DoSimpleWaitForThread(hThread); -} - bool wxConsoleAppTraits::WriteToStderr(const wxString& text) { return wxFprintf(stderr, "%s", text) != -1;