Add a comment about covariant returns

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 08c615af625b4e07b6901ab34cf46633ee78b765..4037833a48c7c5f66a27792c7ba51413e1e47a0b 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -13,10 +13,18 @@
 #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(NOPCH)
+#if ( defined(__WXMSW__) && \
+       ( defined(__BORLANDC__)    || \
+         defined(__VISUALC__)     || \
+         defined(__DIGITALMARS__) || \
+         defined(__WATCOMC__) ) ) || \
+      defined(__VISAGECPP__) || \
+      defined(__MWERKS__)
+
+    // If user did not request NOCPH and we're not building using configure
+    // then assume user wants precompiled headers.
+    #if !defined(NOPCH) && !defined(__WX_SETUP_H__)

         #define WX_PRECOMP
     #endif
 #endif
         #define WX_PRECOMP
     #endif
 #endif


@@ -33,7 +41,7 @@
 #include "wx/wxchar.h"
 
 // include standard Windows headers
 #include "wx/wxchar.h"
 
 // include standard Windows headers

-#if defined(__WXMSW__) && !wxUSE_MFC
+#if defined(__WXMSW__)

     #include "wx/msw/wrapwin.h"
 #endif
 
     #include "wx/msw/wrapwin.h"
 #endif