Trying to hide evidence of my negative programming skills...

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index e4f29ad5b41aa8f1504e26d903b69988c9622392..f8f2e432bc361a52db8200544655d02a9ff6f1d9 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -27,8 +27,16 @@
 
 #ifdef WX_PRECOMP
 
 
 #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 standard Windows headers
 #if defined(__WXMSW__) && !wxUSE_MFC

+    #ifndef STRICT
+        #define STRICT 1
+    #endif
+

     #include <windows.h>
     #include "wx/msw/winundef.h"
 #endif
     #include <windows.h>
     #include "wx/msw/winundef.h"
 #endif