Wrappers for *ToText

[wxWidgets.git] / include / wx / wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index e4f29ad5b41aa8f1504e26d903b69988c9622392..b05ad2b35c488811672a0e97524cd920ca81d440 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -14,7 +14,14 @@
 
 // check if to use precompiled headers: do it for most Windows compilers unless
 // explicitly disabled by defining NOPCH
-#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__)
+#if ( defined(__WXMSW__) && \
+       ( defined(__BORLANDC__)    || \
+         defined(__VISUALC__)     || \
+         defined(__DIGITALMARS__) || \
+         defined(__WATCOMC__) ) ) || \
+      defined(__VISAGECPP__) || \
+      defined(__MWERKS__) 
+
     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif
@@ -27,10 +34,13 @@
 
 #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
 #if defined(__WXMSW__) && !wxUSE_MFC
-    #include <windows.h>
-    #include "wx/msw/winundef.h"
+    #include "wx/msw/wrapwin.h"
 #endif
 
 // include the most common wx headers