make it non mach-o carbon savvy

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index dbf130b1fbf731e4c4cf75b1670f2fc3a3da7ef7..f0dd44e1070193ea932883d8504571f42cd434be 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -14,7 +14,7 @@
 
 // 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(__WXPM__)
+#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__DIGITALMARS__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__) 
     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif
@@ -27,13 +27,16 @@
 
 #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
 #include "wx/wx.h"
 
-#endif // WX_PRECOMP
\ No newline at end of file
+#endif // WX_PRECOMP