WinCE build fix.

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 61218c71902647361d85cde2696201497e7cb760..59b929c7ce47569275d3c4fb122bb7257a41e3cc 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -234,14 +234,20 @@ 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

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

              );
 }
 
              );
 }
 

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index cc9f0bcc87ff4add0812c721ea050faf8faa2f0d..a3b75ce292175cce5a25bc39373e7a4e91b1f49e 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -786,6 +786,9 @@ void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
 
 void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
 {
 
 void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
 {

+
+#ifndef __WXWINCE__
+

     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;
     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;


@@ -821,11 +824,15 @@ void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
     }
     //else: normal case
 
     }
     //else: normal case
 

+#endif // __WXWINCE__
+

     wxTopLevelWindowBase::DoGetPosition(x, y);
 }
 
 void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
 {
     wxTopLevelWindowBase::DoGetPosition(x, y);
 }
 
 void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
 {

+#ifndef __WXWINCE__
+

     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;
     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;


@@ -846,6 +853,8 @@ void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
     }
     //else: normal case
 
     }
     //else: normal case
 

+#endif
+

     wxTopLevelWindowBase::DoGetSize(width, height);
 }
 
     wxTopLevelWindowBase::DoGetSize(width, height);
 }