From 5bdad317aa06da5590f585581677f18765985391 Mon Sep 17 00:00:00 2001 From: George Tasker Date: Fri, 23 Nov 2001 00:42:10 +0000 Subject: [PATCH] "char *" changed to "wxChar *" in several places "Documentation needed" comments removed as the function(s) are now documented git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/db.h | 9 ++++----- src/common/db.cpp | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/wx/db.h b/include/wx/db.h index adfbd49b11..57ec4345f7 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -632,8 +632,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 +694,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); diff --git a/src/common/db.cpp b/src/common/db.cpp index c3957c35e6..f32276faf0 100644 --- 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; @@ -3722,7 +3722,7 @@ int WXDLLEXPORT wxDbConnectionsInUse(void) /********** wxDbLogExtendedErrorMsg() **********/ // DEBUG ONLY function const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText, wxDb *pDb, - char *ErrFile, int ErrLine) + wxChar *ErrFile, int ErrLine) { static wxString msg; msg = userText; -- 2.45.2