use wxHashMap, not wxHashTable in wxXPMDecoder

[wxWidgets.git] / src / common / db.cpp

diff --git a/src/common/db.cpp b/src/common/db.cpp
index c3957c35e6eb2067e9ce9d03f9e20de219706b8a..065a0ac9d59dd3d03f754f7e00dabdf2573c0cdc 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -3272,7 +3272,7 @@ bool wxDb::TablePrivileges(const wxString &tableName, const wxString &priv, cons
 }  // wxDb::TablePrivileges
 
 
-const wxString wxDb::SQLTableName(const char *tableName)
+const wxString wxDb::SQLTableName(const wxChar *tableName)
 {
     wxString TableName;
 
@@ -3286,7 +3286,7 @@ const wxString wxDb::SQLTableName(const char *tableName)
 }  // wxDb::SQLTableName()
 
 
-const wxString wxDb::SQLColumnName(const char *colName)
+const wxString wxDb::SQLColumnName(const wxChar *colName)
 {
     wxString ColName;
 
@@ -3721,8 +3721,10 @@ int WXDLLEXPORT wxDbConnectionsInUse(void)
 
 /********** wxDbLogExtendedErrorMsg() **********/
 // DEBUG ONLY function
-const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText, wxDb *pDb,
-                             char *ErrFile, int ErrLine)
+const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText,
+                                                  wxDb *pDb,
+                                                  const wxChar *ErrFile,
+                                                  int ErrLine)
 {
     static wxString msg;
     msg = userText;