api uniformity between tabart and dockart

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

diff --git a/include/wx/db.h b/include/wx/db.h
index 5d7d67c220d0bfc794ce8c4a00b1a1c9b8d216d3..f678c71452da534a9e34fbdd3efc6273f102924e 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
     #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,
     #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 "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
     #endif
     extern "C" {
     #if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC


@@ -80,11 +74,22 @@
           #endif
         #endif
     #else
           #endif
         #endif
     #else

+      #if defined( __WXMOTIF__ ) && defined( __VMS )
+       // solves a type definition mismatch between IODBC and MOTIF on OpenVMS
+      #define BOOL int
+      #endif
+      #if defined( __DARWIN__ )
+       // solves a type definition mismatch between IODBC and Cocoa
+      #define BOOL signed char
+      #endif 

         #include <sql.h>
         #include <sqlext.h>
         //#if wxUSE_UNICODE
         //    #include <sqlucode.h>
         //#endif
         #include <sql.h>
         #include <sqlext.h>
         //#if wxUSE_UNICODE
         //    #include <sqlucode.h>
         //#endif

+      #if defined( __WXMOTIF__ ) && defined( __VMS )
+      #undef BOOL
+      #endif

     #endif
     }
 #endif
     #endif
     }
 #endif


@@ -727,6 +732,9 @@ public:
 
     bool         FwdOnlyCursors(void)  {return fwdOnlyCursors;}
 
 
     bool         FwdOnlyCursors(void)  {return fwdOnlyCursors;}
 

+    // return the string with all special SQL characters escaped
+    wxString     EscapeSqlChars(const wxString& value);
+

     // These two functions are provided strictly for use by wxDbTable.
     // DO NOT USE THESE FUNCTIONS, OR MEMORY LEAKS MAY OCCUR
     void         incrementTableCount() { nTables++; return; }
     // These two functions are provided strictly for use by wxDbTable.
     // DO NOT USE THESE FUNCTIONS, OR MEMORY LEAKS MAY OCCUR
     void         incrementTableCount() { nTables++; return; }