ok, putting it back... not everybody has autoheader

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index a5e0b4bce88707c3d44680a987866c20730cec7b..80526f249bf110638b7006969d24fd844e1f096e 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -6,61 +6,34 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/setup.h"   // always include this file (under Unix it's generated by configure)
+#include "wx/defs.h"    // compiler definitions
+
 // check if to use precompiled headers
-#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__GNUWIN32__)) && defined(__WXMSW__)
-#if !NOPCH
-#define WX_PRECOMP
-#endif
+#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)
+    #if !defined(NOPCH)
+        #define WX_PRECOMP
+    #endif
 #endif
 
 // For some reason, this must be defined for common dialogs to work.
 #ifdef __WATCOMC__
-#define INCLUDE_COMMDLG_H      1
+#define INCLUDE_COMMDLG_H  1
 #endif
 
 // include the wx definitions
 #ifdef WX_PRECOMP
-#include "wx/wx.h"
 
-// Comment this out if you don't mind slower compilation of the wxWindows
-// library
-#ifndef __WXMAC__
+#ifdef __WXMSW__
 #include <windows.h>
+#include "wx/msw/winundef.h"
 #endif
 
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
-#ifdef DrawText
-#undef DrawText
-#endif
-
-#ifdef GetCharWidth
-#undef GetCharWidth
-#endif
-
-#ifdef StartDoc
-#undef StartDoc
-#endif
-
-#ifdef FindWindow
-#undef FindWindow
-#endif
+#include "wx/wx.h"
 
-#ifdef FindResource
-#undef FindResource
-#endif
 
-#else
-  // always include this file (under Unix it's generated by configure)
-  #include "wx/setup.h"
-#endif
+#endif // WX_PRECOMP