A better fix for wxHash{Map,Set} with g++ 4.7.

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 6baf80e6f04ed10fe65c6d95683b41a8979a6000..340404407ed149afd9998e2509d19938e9dd3d35 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -14,13 +14,12 @@
 
 // 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(__WXMSW__) && \
-       ( defined(__BORLANDC__)    || \
-         defined(__VISUALC__)     || \
-         defined(__DIGITALMARS__) || \
-         defined(__WATCOMC__) ) ) || \
-      defined(__VISAGECPP__) || \
-      defined(__MWERKS__)
+#if defined(__VISUALC__)   || \
+    defined(__DMC__)       || \
+    defined(__VISAGECPP__) || \
+    defined(__WATCOMC__)   || \
+    defined(__BORLANDC__)
+

 
     // If user did not request NOCPH and we're not building using configure
     // then assume user wants precompiled headers.
 
     // If user did not request NOCPH and we're not building using configure
     // then assume user wants precompiled headers.


@@ -36,18 +35,17 @@
 
 #ifdef WX_PRECOMP
 
 
 #ifdef WX_PRECOMP
 

-// include "wx/wxchar.h" first to ensure that UNICODE macro is correctly set
+// include "wx/chartype.h" first to ensure that UNICODE macro is correctly set

 // _before_ including <windows.h>
 // _before_ including <windows.h>

-#include "wx/wxchar.h"
+#include "wx/chartype.h"

 
 // include standard Windows headers
 #if defined(__WXMSW__)
     #include "wx/msw/wrapwin.h"
 
 // include standard Windows headers
 #if defined(__WXMSW__)
     #include "wx/msw/wrapwin.h"

-#endif
-
-// include all PalmOS headers at once
-#ifdef __WXPALMOS__
-#   include <PalmOS.h>
+    #include "wx/msw/wrapcctl.h"
+    #include "wx/msw/wrapcdlg.h"
+    #include "wx/msw/private.h"
+    #include "wx/msw/missing.h"

 #endif
 
 // include <os2.h>
 #endif
 
 // include <os2.h>


@@ -55,11 +53,6 @@
 #   include "wx/os2/private.h"
 #endif
 
 #   include "wx/os2/private.h"
 #endif
 

-// include mgl headers
-#ifdef __WXMGL__
-#   include "wx/mgl/private.h"
-#endif
-

 // include the most common wx headers
 #include "wx/wx.h"
 
 // include the most common wx headers
 #include "wx/wx.h"