X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/243d4b360385d3364e96d5600f693139e359fb3b..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index adfbd49b11..5216709500 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -57,8 +57,17 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
-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
@@ -69,10 +78,12 @@ extern "C" {
     #include "sqlext.h"
     #include "odbcinst.h"
 #else
+extern "C" {
     #include "wx/isql.h"
     #include "wx/isqlext.h"
-#endif
 }
+#endif
+
 
 typedef float SFLOAT;
 typedef double SDOUBLE;
@@ -112,9 +123,8 @@ enum enumDummy {enumDum1};
 */
 const int wxDB_PATH_MAX                 = 254;
 
-extern wxChar const *SQL_LOG_FILENAME;
-extern wxChar const *SQL_CATALOG_FILENAME;
-
+WXDLLEXPORT_DATA(extern wxChar const *) SQL_LOG_FILENAME;
+WXDLLEXPORT_DATA(extern wxChar const *) SQL_CATALOG_FILENAME;
 
 // Database Globals
 const int DB_TYPE_NAME_LEN            = 40;
@@ -447,7 +457,8 @@ enum wxDBMS
 // why the connection failed.  Note: as each wxDb object is closed, it
 // will overwrite the errors of the previously destroyed wxDb object in
 // this variable.
-extern wxChar DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
+
+WXDLLEXPORT_DATA(extern wxChar) DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
 
 class WXDLLEXPORT wxDb
@@ -632,8 +643,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 +705,13 @@ 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
+const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText,
+                                                  wxDb *pDb,
+                                                  const 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);