test whether pointer is non-NULL before using it, not after, in wxAnimation::Load...

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

diff --git a/include/wx/db.h b/include/wx/db.h
index bdd7ffb0103c810abf1237ff80aac76996c1cf4c..7c3924b57db667bb623c815b109d4652dda5d72e 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -41,12 +41,7 @@
     #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,
@@ -62,9 +57,8 @@
     //#endif
     #include "odbcinst.h"
 #else
-    #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) )
-        #include <windows.h>
-        #include "wx/msw/winundef.h"
+    #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__)  || defined (__DMC__))
+        #include "wx/msw/wrapwin.h"
     #endif
     extern "C" {
     #if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC
@@ -79,20 +73,16 @@
           typedef UCHAR SQLTCHAR;
           #endif
         #endif
-    #else
-      #if defined( __WXMOTIF__ ) && defined( __VMS )
-       // solves a type definition mismatch between IODBC and MOTIF on OpenVMS
-      #define BOOL int
-      #endif
+    #else // !wxUSE_BUILTIN_IODBC
+        // SQL headers define BOOL if it's not defined yet but BOOL is also
+        // defined in many other places on other systems (Motif, at least on
+        // OpenVMS; Cocoa and X11) so prevent the problem by defining it before
+        // including these headers
+        #define BOOL int
         #include <sql.h>
         #include <sqlext.h>
-        //#if wxUSE_UNICODE
-        //    #include <sqlucode.h>
-        //#endif
-      #if defined( __WXMOTIF__ ) && defined( __VMS )
-      #undef BOOL
-      #endif
-    #endif
+        #undef BOOL
+    #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC
     }
 #endif