Don't overwrite status message when restoring it if it changed.

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

diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp
index 5af350eb5a6ec9841e4bf11585b6ef80fb0f1a34..4981322259fe6006ab884c9b50f7b52f24d3bf72 100644 (file)
--- a/src/msw/basemsw.cpp
+++ b/src/msw/basemsw.cpp
@@ -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"


@@ -42,8 +43,6 @@
 // wxAppTraits implementation
 // ============================================================================
 
 // wxAppTraits implementation
 // ============================================================================
 

-GSocketManager *wxAppTraits::ms_manager = NULL;
-

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


@@ -53,21 +52,6 @@ WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
 // 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