Some compilation fixes

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

diff --git a/include/wx/db.h b/include/wx/db.h
index adfbd49b113239574e2992615aca935543df9b6b..cc2c1d84e8e1f1f3c5c465a449ca519ed7bb0e93 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -59,6 +59,16 @@
 
 extern "C" {
 #ifdef __VISUALC__
+// include standard Windows headers
+#if defined(__WXMSW__) && !wxUSE_MFC
+    #ifndef STRICT
+        #define STRICT 1
+    #endif
+
+    #include <windows.h>
+    #include "wx/msw/winundef.h"
+#endif
+
 // If you use the wxDbCreateDataSource() function with MSW/VC6,
 // you cannot use the iODBC headers, you must use the VC headers,
 // plus the odbcinst.h header - gt Nov 2 2000
@@ -632,8 +642,8 @@ public:
     // in the table name or column name, the returned string will have the
     // correct enclosing marks around the name to allow it to be properly 
     // included in a SQL statement
-    const wxString  SQLTableName(const char *tableName);
-    const wxString  SQLColumnName(const char *colName);
+    const wxString  SQLTableName(const wxChar *tableName);
+    const wxString  SQLColumnName(const wxChar *colName);
 
     void         LogError(const wxString &errMsg, const wxString &SQLState = wxEmptyString) 
                         { logError(errMsg, SQLState); }
@@ -694,12 +704,11 @@ void  WXDLLEXPORT  wxDbCloseConnections(void);
 int   WXDLLEXPORT  wxDbConnectionsInUse(void);
 
 
-//TODO: document
 // Writes a message to the wxLog window (stdout usually) when an internal error
 // situation occurs.  This function only works in DEBUG builds
 const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText, wxDb *pDb,
-                                                  char *ErrFile, int ErrLine);
-//TODO: end document
+                                                  wxChar *ErrFile, int ErrLine);
+
 
 // This function sets the sql log state for all open wxDb objects
 bool  WXDLLEXPORT  wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);