Make QS_ALLPOSTMESSAGE available everywhere regardless SDK limitations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index f2424edc7284a21f857b04e4efd9ea0934264dff..89bcfa15c8b99988bc2938342231ead44e63f9b2 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -138,6 +138,10 @@
 #define LWA_ALPHA 2
 #endif
 
 #define LWA_ALPHA 2
 #endif
 

+#ifndef QS_ALLPOSTMESSAGE
+#define QS_ALLPOSTMESSAGE 0
+#endif
+

 /*
  * The following are required for VC++ 5 when the PSDK is not available.
  */
 /*
  * The following are required for VC++ 5 when the PSDK is not available.
  */

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 59b929c7ce47569275d3c4fb122bb7257a41e3cc..a51804288926df98094e84a1b56d818bb2edf8bc 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -77,10 +77,7 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-// For MB_TASKMODAL
-#ifdef __WXWINCE__
-#include "wx/msw/wince/missing.h"
-#endif
+#include "wx/msw/missing.h"

 
 // instead of including <shlwapi.h> which is not part of the core SDK and not
 // shipped at all with other compilers, we always define the parts of it we
 
 // instead of including <shlwapi.h> which is not part of the core SDK and not
 // shipped at all with other compilers, we always define the parts of it we


@@ -234,20 +231,14 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread)
     if ( !wxEventLoop::GetActive() )
         return DoSimpleWaitForThread(hThread);
 
     if ( !wxEventLoop::GetActive() )
         return DoSimpleWaitForThread(hThread);
 

-    const DWORD wakeMask =
-               QS_ALLINPUT          // return as soon as there are any events
-#if !defined(__WXWINCE__)
-               | QS_ALLPOSTMESSAGE
-#endif
-               ;
-

     return ::MsgWaitForMultipleObjects
              (
                1,                   // number of objects to wait for
                (HANDLE *)&hThread,  // the objects
                false,               // wait for any objects, not all
                INFINITE,            // no timeout
     return ::MsgWaitForMultipleObjects
              (
                1,                   // number of objects to wait for
                (HANDLE *)&hThread,  // the objects
                false,               // wait for any objects, not all
                INFINITE,            // no timeout

-               wakeMask
+               QS_ALLINPUT |        // return as soon as there are any events
+               QS_ALLPOSTMESSAGE

              );
 }
 
              );
 }
 

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 1aebef47565dddbf212cdbce532fbf7c45ce9327..74ab15f4c9baa034640261a938e3b78cc0709a92 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -752,9 +752,6 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
             }
         }
 
             }
         }
 

-#if !defined(QS_ALLPOSTMESSAGE)
-#define QS_ALLPOSTMESSAGE 0
-#endif

         wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
         if ( traits )
         {
         wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
         if ( traits )
         {