Compilation fir for VC6 after r73124.

[wxWidgets.git] / src / msw / basemsw.cpp

diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp
index 1763d4d46d697144ecbf2341dd76fb65f54bd6f8..67ab1674a6ea4423aee72d14c953676c59bd8301 100644 (file)
--- 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 <vadim@wxwindows.org>
 // 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 <vadim@wxwindows.org>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/event.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"


@@ -35,38 +36,24 @@
 // wxBase.dll, and MSVC 5 will give linker errors
 #include "wx/recguard.h"
 
 // wxBase.dll, and MSVC 5 will give linker errors
 #include "wx/recguard.h"
 

+#include "wx/crt.h"

 #include "wx/msw/private.h"
 
 // ============================================================================
 // wxAppTraits implementation
 // ============================================================================
 
 #include "wx/msw/private.h"
 
 // ============================================================================
 // wxAppTraits implementation
 // ============================================================================
 

-GSocketManager *wxAppTraits::ms_manager = NULL;
-
+#if wxUSE_THREADS

 WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
 {
     return ::WaitForSingleObject((HANDLE)hThread, INFINITE);
 }
 WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
 {
     return ::WaitForSingleObject((HANDLE)hThread, INFINITE);
 }

+#endif // wxUSE_THREADS

 
 // ============================================================================
 // wxConsoleAppTraits implementation
 // ============================================================================
 
 
 // ============================================================================
 // 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
 void *wxConsoleAppTraits::BeforeChildWaitLoop()
 {
     // nothing to do here


@@ -78,12 +65,19 @@ void wxConsoleAppTraits::AfterChildWaitLoop(void * WXUNUSED(data))
     // nothing to do here
 }
 
     // nothing to do here
 }
 

+#if wxUSE_THREADS

 bool wxConsoleAppTraits::DoMessageFromThreadWait()
 {
     // nothing to process here
     return true;
 }
 
 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)
 #if wxUSE_TIMER
 
 wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)


@@ -103,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;
 bool wxConsoleAppTraits::WriteToStderr(const wxString& text)
 {
     return wxFprintf(stderr, "%s", text) != -1;