projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added header preprocessor guard
[wxWidgets.git]
/
include
/
wx
/
wxprec.h
diff --git
a/include/wx/wxprec.h
b/include/wx/wxprec.h
index 6f28387b898cbb5f1e42a997ff6e4a1ee4b5bf81..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
// 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
#if !defined(NOPCH)
#define WX_PRECOMP
#endif
@@
-27,10
+27,13
@@
#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
// 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
#endif
// include the most common wx headers