SetIcon added

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 6f542b6a456b7d3c869e7fbb8ba1aa23631b8c81..c79a641ffef0ffb328d1cc7621e666a708b32a88 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -13,8 +13,8 @@
 #include "wx/defs.h"    // compiler definitions
 
 // check if to use precompiled headers
 #include "wx/defs.h"    // compiler definitions
 
 // check if to use precompiled headers

-#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)
-    #if !NOPCH
+#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__WXPM__)
+    #if !defined(NOPCH)

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


@@ -26,45 +26,19 @@
 
 // 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__)
+#ifdef __WXMSW__

 #include <windows.h>
 #include <windows.h>

+#include "wx/msw/winundef.h"

 #endif
 
 #endif
 

-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
-#ifdef DrawText
-#undef DrawText
-#endif
-
-#ifdef GetCharWidth
-#undef GetCharWidth
+#ifdef __WXPM__
+#define INCL_OS2
+#include <os2.h>

 #endif
 
 #endif
 

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

 
 

-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif

 
 #endif // WX_PRECOMP
 
 
 #endif // WX_PRECOMP