Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 5e2902b424b0b88e3901deafe14f6149652720ab..f0dd44e1070193ea932883d8504571f42cd434be 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -14,7 +14,7 @@
 
 // check if to use precompiled headers: do it for most Windows compilers unless
 // explicitly disabled by defining NOPCH
 
 // check if to use precompiled headers: do it for most Windows compilers unless
 // explicitly disabled by defining NOPCH

-#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__)
+#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__DIGITALMARS__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__) 

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


@@ -33,12 +33,7 @@
 
 // include standard Windows headers
 #if defined(__WXMSW__) && !wxUSE_MFC
 
 // include standard Windows headers
 #if defined(__WXMSW__) && !wxUSE_MFC

-    #ifndef STRICT
-        #define STRICT 1
-    #endif
-
-    #include <windows.h>
-    #include "wx/msw/winundef.h"
+    #include "wx/msw/wrapwin.h"

 #endif
 
 // include the most common wx headers
 #endif
 
 // include the most common wx headers