diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 88e485e64b..3ccf5f6e34 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -146,9 +146,11 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 
     if ( exstyle )
     {
+#ifndef __WXWINCE__
         if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
             *exstyle = WS_EX_TRANSPARENT;
         else
+#endif
             *exstyle = 0;
     }
 
diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 24aa2a43fd..2b7b332195 100644
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -705,14 +705,17 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
             }
         }
 
+#if defined(__WXWINCE__) && !defined(QS_ALLPOSTMESSAGE)
+#define QS_ALLPOSTMESSAGE 0
+#endif
+
         result = ::MsgWaitForMultipleObjects
                  (
                    1,              // number of objects to wait for
                    &m_hThread,     // the objects
                    false,          // don't wait for all objects
                    INFINITE,       // no timeout
-                   QS_ALLINPUT |   // return as soon as there are any events
-                   QS_ALLPOSTMESSAGE
+                   QS_ALLINPUT|QS_ALLPOSTMESSAGE   // return as soon as there are any events
                  );
 
         switch ( result )