From dba2120c77bf1ee0822a389302b9e8c93f08fa4f Mon Sep 17 00:00:00 2001 From: George Tasker Date: Tue, 12 Jun 2001 17:20:10 +0000 Subject: [PATCH] Fixed compile problems under MingW32 compiler git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/db.h | 4 ++-- src/common/db.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/db.h b/include/wx/db.h index 29efb2b3a6..86fa70404c 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -600,7 +600,7 @@ public: wxDbColInf *GetColumns(wxChar *tableName[], const wxChar *userID=NULL); wxDbColInf *GetColumns(const wxString &tableName, UWORD *numCols, const wxChar *userID=NULL); - UWORD GetColumnCount(const wxString &tableName, const wxChar *userID=NULL); + int GetColumnCount(const wxString &tableName, const wxChar *userID=NULL); const wxChar *GetDatabaseName(void) {return dbInf.dbmsName;} const wxString &GetDataSource(void) {return dsn;} const wxString &GetDatasourceName(void){return dsn;} @@ -705,7 +705,7 @@ int WXDLLEXPORT wxDbCreateDataSource(const wxString &driverName, const wxString // the first time using SQL_FETCH_FIRST. Continue to call it // using SQL_FETCH_NEXT until you've exhausted the list. bool WXDLLEXPORT wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc, - SWORD DsDescMax, DWORD direction = SQL_FETCH_NEXT); + SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT); // Change this to 0 to remove use of all deprecated functions diff --git a/src/common/db.cpp b/src/common/db.cpp index 57b25f226d..4912134e0b 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -1403,7 +1403,7 @@ void wxDb::Close(void) { s.Printf(wxT("(%-20s) tableID:[%6lu] pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb); s2.Printf(wxT("Orphaned found using pDb:[%p]"),this); - wxLogDebug (s,s2); + wxLogDebug (s.c_str(),s2.c_str()); } pNode = pNode->Next(); } @@ -2757,7 +2757,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh /********** wxDb::GetColumnCount() **********/ -UWORD wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID) +int wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID) /* * Returns a count of how many columns are in a table. * If an error occurs in computing the number of columns @@ -3845,7 +3845,7 @@ int wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const /********** wxDbGetDataSource() **********/ bool wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc, - SWORD DsDescMax, DWORD direction) + SWORD DsDescMax, UWORD direction) /* * Dsn and DsDesc will contain the data source name and data source * description upon return -- 2.45.2