MSVC 5 fix.

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index f51d04c60bb5e3a3309324e009912afb965145d1..f0dd44e1070193ea932883d8504571f42cd434be 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -6,59 +6,37 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-// check if to use precompiled headers
-#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__GNUWIN32__)) && defined(__WXMSW__)
-#if !NOPCH
-#define WX_PRECOMP
-#endif
+// compiler detection; includes setup.h
+#include "wx/defs.h"
+
+// check if to use precompiled headers: do it for most Windows compilers unless
+// explicitly disabled by defining NOPCH
+#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__DIGITALMARS__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__) 
+    #if !defined(NOPCH)
+        #define WX_PRECOMP
+    #endif

 #endif
 
 // For some reason, this must be defined for common dialogs to work.
 #ifdef __WATCOMC__
 #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
 
 #endif
 

-// include the wx definitions

 #ifdef WX_PRECOMP
 #ifdef WX_PRECOMP

-#include "wx/wx.h"

 
 

-// Comment this out if you don't mind slower compilation of the wxWindows
-// library
-#include <windows.h>
-
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
-#ifdef DrawText
-#undef DrawText
-#endif
+// include <wx/wxchar.h> first to ensure that UNICODE macro is correctly set
+// _before_ including <windows.h>
+#include "wx/wxchar.h"

 
 

-#ifdef GetCharWidth
-#undef GetCharWidth
+// include standard Windows headers
+#if defined(__WXMSW__) && !wxUSE_MFC
+    #include "wx/msw/wrapwin.h"

 #endif
 
 #endif
 

-#ifdef StartDoc
-#undef StartDoc
-#endif
-
-#ifdef FindWindow
-#undef FindWindow
-#endif
-
-#ifdef FindResource
-#undef FindResource
-#endif
-
-#else
-  // always include this file (under Unix it's generated by configure)
-  #include "wx/setup.h"
-#endif
+// include the most common wx headers
+#include "wx/wx.h"

 
 

+#endif // WX_PRECOMP