#include "wx/defs.h"
// check if to use precompiled headers: do it for most Windows compilers unless
+// adding DigitalMars here appears to amke it slower!
// explicitly disabled by defining NOPCH
-#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__WXPM__)
+#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__DIGITALMARS__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__)
#if !defined(NOPCH)
#define WX_PRECOMP
#endif
#ifdef WX_PRECOMP
+// include <wx/wxchar.h> first to ensure that UNICODE macro is correctly set
+// _before_ including <windows.h>
+#include "wx/wxchar.h"
+
// include standard Windows headers
-#ifdef __WXMSW__
- #include <windows.h>
- #include "wx/msw/winundef.h"
+#if defined(__WXMSW__) && !wxUSE_MFC
+ #include "wx/msw/wrapwin.h"
#endif
// include the most common wx headers