Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index c79a641ffef0ffb328d1cc7621e666a708b32a88..4b215bf0dcbb963a4622851778f59d0ccaa77037 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -9,11 +9,13 @@
 // 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
+// compiler detection; includes setup.h
+#include "wx/defs.h"

 
 

-// check if to use precompiled headers
-#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__WXPM__)
+// 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
+#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__) 

     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif
     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif


@@ -21,24 +23,26 @@
 
 // For some reason, this must be defined for common dialogs to work.
 #ifdef __WATCOMC__
 
 // 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
 

-#ifdef __WXMSW__
-#include <windows.h>
-#include "wx/msw/winundef.h"
-#endif
+// include <wx/wxchar.h> first to ensure that UNICODE macro is correctly set
+// _before_ including <windows.h>
+#include "wx/wxchar.h"
+
+// include standard Windows headers
+#if defined(__WXMSW__) && !wxUSE_MFC
+    #ifndef STRICT
+        #define STRICT 1
+    #endif

 
 

-#ifdef __WXPM__
-#define INCL_OS2
-#include <os2.h>
+    #include <windows.h>
+    #include "wx/msw/winundef.h"

 #endif
 
 #endif
 

+// include the most common wx headers

 #include "wx/wx.h"
 
 #include "wx/wx.h"
 

-

 #endif // WX_PRECOMP
 #endif // WX_PRECOMP

-