]> git.saurik.com Git - wxWidgets.git/commitdiff
do not include <windows.h> directly
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 1 Nov 2006 14:35:55 +0000 (14:35 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 1 Nov 2006 14:35:55 +0000 (14:35 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/db.h

index bdd7ffb0103c810abf1237ff80aac76996c1cf4c..41c63267fe7834205982029f7c34c2115f88d0b6 100644 (file)
     #if wxUSE_MFC
         #include <afxwin.h>
     #else // !wxUSE_MFC
-        #ifndef STRICT
-            #define STRICT 1
-        #endif
-
-        #include <windows.h>
-        #include "wx/msw/winundef.h"
+        #include "wx/msw/wrapwin.h"
     #endif // wxUSE_MFC/!wxUSE_MFC
 
     // If you use the wxDbCreateDataSource() function with MSW/VC6,
@@ -63,8 +58,7 @@
     #include "odbcinst.h"
 #else
     #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) )
-        #include <windows.h>
-        #include "wx/msw/winundef.h"
+        #include "wx/msw/wrapwin.h"
     #endif
     extern "C" {
     #if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC