Remaining Makefile.ins,

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 940c4a6521a11f2432b516d95e81e0b26f6a3398..80526f249bf110638b7006969d24fd844e1f096e 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -14,7 +14,7 @@
 
 // check if to use precompiled headers
 #if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)
 
 // check if to use precompiled headers
 #if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)

-    #if !NOPCH
+    #if !defined(NOPCH)

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


@@ -26,45 +26,14 @@
 
 // include the wx definitions
 #ifdef WX_PRECOMP
 
 // 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
-#if !defined(__WXMAC__) && !defined(__SALFORDC__)
-// #include <windows.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
+#ifdef __WXMSW__
+#include <windows.h>
+#include "wx/msw/winundef.h"

 #endif
 
 #endif
 

-#ifdef FindResource
-#undef FindResource
-#endif
+#include "wx/wx.h"

 
 

-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif

 
 #endif // WX_PRECOMP
 
 
 #endif // WX_PRECOMP