X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e9b921dc6b84d9d4beb1a5bbd2380910073c7ae..62381daaaf09071bdc408645ed46acd14ffb133a:/src/msw/app.cpp?ds=sidebyside

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 9606840cdd..474e8e4839 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -49,8 +49,10 @@
 #include "wx/filename.h"
 #include "wx/dynlib.h"
 #include "wx/evtloop.h"
+#include "wx/thread.h"
 
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 #include "wx/msw/ole/oleutils.h"
 #include "wx/msw/private/timer.h"
 
@@ -60,7 +62,7 @@
 
 // OLE is used for drag-and-drop, clipboard, OLE Automation..., but some
 // compilers don't support it (missing headers, libs, ...)
-#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
+#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__)
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0
@@ -605,6 +607,9 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 // system DLL versions
 // ----------------------------------------------------------------------------
 
+// these functions have trivial inline implementations for CE
+#ifndef __WXWINCE__
+
 #if wxUSE_DYNLIB_CLASS
 
 namespace
@@ -740,6 +745,8 @@ int wxApp::GetShell32Version()
 
 #endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
 
+#endif // !__WXWINCE__
+
 // ----------------------------------------------------------------------------
 // Yield to incoming messages
 // ----------------------------------------------------------------------------