declare wxEntry() as taking char **Argv, not char *argv[]

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

diff --git a/include/wx/db.h b/include/wx/db.h
index 5216709500e925e33b5cdc13cc1a66b69b83f7c3..e43e77db956f0446fefe4f7d3f9640d895f8eea8 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -48,7 +48,7 @@
 
 #include "wx/version.h"
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "db.h"
 #endif
 
@@ -77,6 +77,12 @@
     #include "sql.h"
     #include "sqlext.h"
     #include "odbcinst.h"
+#elif defined( __VMS )
+// For OpenVMS use the ones from the library
+extern "C" {
+    #include <isql.h>
+    #include <isqlext.h>
+}
 #else
 extern "C" {
     #include "wx/isql.h"
@@ -446,7 +452,8 @@ enum wxDBMS
     dbmsVIRTUOSO,
     dbmsDB2,
     dbmsINTERBASE,
-    dbmsPERVASIVE_SQL
+    dbmsPERVASIVE_SQL,
+    dbmsXBASE_SEQUITER
 };
 
 
@@ -591,7 +598,8 @@ public:
     wxDb(const HENV &aHenv, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
     ~wxDb();
 
-    bool         Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr);  // Data Source Name, User ID, Password
+    // Data Source Name, User ID, Password and whether open should fail on data type not supported
+    bool         Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr, bool failOnDataTypeUnsupported=TRUE);
     bool         Open(wxDbConnectInf *dbConnectInf);
     bool         Open(wxDb *copyDb);  // pointer to a wxDb whose connection info should be copied rather than re-queried
     void         Close(void);