projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reSWIGged
[wxWidgets.git]
/
include
/
wx
/
wxprec.h
diff --git
a/include/wx/wxprec.h
b/include/wx/wxprec.h
index 76f16b4108be49afcb6adcb687a0bd80cee92098..5e34e7089cdb710fb2a64afef86fa1c890ff8b31 100644
(file)
--- a/
include/wx/wxprec.h
+++ b/
include/wx/wxprec.h
@@
-13,9
+13,15
@@
#include "wx/defs.h"
// check if to use precompiled headers: do it for most Windows compilers unless
#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
// explicitly disabled by defining NOPCH
-#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__DIGITALMARS__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__)
+#if ( defined(__WXMSW__) && \
+ ( defined(__BORLANDC__) || \
+ defined(__VISUALC__) || \
+ defined(__DIGITALMARS__) || \
+ defined(__WATCOMC__) ) ) || \
+ defined(__VISAGECPP__) || \
+ defined(__MWERKS__)
+
#if !defined(NOPCH)
#define WX_PRECOMP
#endif
#if !defined(NOPCH)
#define WX_PRECOMP
#endif
@@
-33,13
+39,8
@@
#include "wx/wxchar.h"
// include standard Windows headers
#include "wx/wxchar.h"
// include standard Windows headers
-#if defined(__WXMSW__) && !wxUSE_MFC
- #ifndef STRICT
- #define STRICT 1
- #endif
-
- #include <windows.h>
- #include "wx/msw/winundef.h"
+#if defined(__WXMSW__)
+ #include "wx/msw/wrapwin.h"
#endif
// include the most common wx headers
#endif
// include the most common wx headers