Applied patch [ 819044 ] Adds MSW wxPen::GetDashCount

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

diff --git a/include/wx/db.h b/include/wx/db.h
index 225563e3f6cafd50b6c93060c2e64a8dd6198b57..1c007c953c4a8bba80fea02f505f047758edbd7d 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -99,6 +99,11 @@ typedef double SDOUBLE;
 typedef unsigned int UINT;
 #define ULONG UDWORD
 
+// Not available in iODBC
+#ifndef __WXMSW__
+typedef UCHAR SQLTCHAR;
+#endif
+
 #ifndef wxODBC_FWD_ONLY_CURSORS
 #define wxODBC_FWD_ONLY_CURSORS 1
 #endif
@@ -486,7 +491,7 @@ private:
     wxDBMS           dbmsType;        // Type of datasource - i.e. Oracle, dBase, SQLServer, etc
 
     // Private member functions
-    bool             getDbInfo(void);
+    bool             getDbInfo(bool failOnDataTypeUnsupported = TRUE);
     bool             getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo);
     bool             setConnectionOptions(void);
     void             logError(const wxString &errMsg, const wxString &SQLState);