From: George Tasker Date: Wed, 11 Apr 2001 14:37:48 +0000 (+0000) Subject: A couple more 'int' to UWORD conversions I had not merged into my previous checkin. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e938ff5e2013d1181d2eb740f1c9836fc0dc7575 A couple more 'int' to UWORD conversions I had not merged into my previous checkin. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h index 8c8764587b..8c51ceb508 100644 --- a/include/wx/dbtable.h +++ b/include/wx/dbtable.h @@ -236,7 +236,7 @@ public: #else void SetFromClause(const wxString &From) { from = From; } void SetOrderByClause(const wxString &OrderBy) { orderBy = OrderBy; } - bool SetOrderByColNums(int first, ...); + bool SetOrderByColNums(UWORD first, ...); void SetWhereClause(const wxString &Where) { where = Where; } void From(const wxString &From) { from = From; } void OrderBy(const wxString &OrderBy) { orderBy = OrderBy; } @@ -296,7 +296,7 @@ public: #endif bool CanSelectForUpdate(void); bool CanUpdByROWID(void); - void ClearMemberVar(int colNo, bool setToNull=FALSE); + void ClearMemberVar(UWORD colNo, bool setToNull=FALSE); void ClearMemberVars(bool setToNull=FALSE); bool SetQueryTimeout(UDWORD nSeconds); @@ -320,8 +320,8 @@ public: ULONG Count(const wxString &args="*"); int DB_STATUS(void) { return(pDb->DB_STATUS); } - bool IsColNull(int colNo); - bool SetColNull(int colNo, bool set=TRUE); + bool IsColNull(UWORD colNo); + bool SetColNull(UWORD colNo, bool set=TRUE); bool SetColNull(const wxString &colName, bool set=TRUE); #if wxODBC_BACKWARD_COMPATABILITY // The following member functions are deprecated. You should use the SetColNull() diff --git a/src/common/db.cpp b/src/common/db.cpp index 6b5bff21b2..eecd419a3b 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -2105,7 +2105,7 @@ wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID) */ { UWORD noCols = 0; - int colNo = 0; + UWORD colNo = 0; wxDbColInf *colInf = 0; RETCODE retcode; @@ -2263,7 +2263,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, UWORD *numCols, const wx { UWORD noCols = 0; - int colNo = 0; + UWORD colNo = 0; wxDbColInf *colInf = 0; RETCODE retcode; @@ -2518,7 +2518,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh // to avoid undesired unbinding of columns. { UWORD noCols = 0; - int colNo = 0; + UWORD colNo = 0; wxDbColInf *colInf = 0; RETCODE retcode; diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp index 524fb96e8e..68b5fd652f 100644 --- a/src/common/dbtable.cpp +++ b/src/common/dbtable.cpp @@ -1686,9 +1686,9 @@ bool wxDbTable::DropIndex(const wxString &idxName) /********** wxDbTable::SetOrderByColNums() **********/ -bool wxDbTable::SetOrderByColNums(int first, ... ) +bool wxDbTable::SetOrderByColNums(UWORD first, ... ) { - int colNo = first; + int colNo = first; // using 'int' to be able to look for wxDB_NO_MORE_COLUN_NUMBERS va_list argptr; bool abort = FALSE; @@ -1879,7 +1879,7 @@ bool wxDbTable::DeleteMatching(void) /********** wxDbTable::IsColNull() **********/ -bool wxDbTable::IsColNull(int colNo) +bool wxDbTable::IsColNull(UWORD colNo) { /* This logic is just not right. It would indicate TRUE @@ -1964,7 +1964,7 @@ bool wxDbTable::IsCursorClosedOnCommit(void) /********** wxDbTable::ClearMemberVar() **********/ -void wxDbTable::ClearMemberVar(int colNo, bool setToNull) +void wxDbTable::ClearMemberVar(UWORD colNo, bool setToNull) { wxASSERT(colNo < noCols); @@ -2313,8 +2313,8 @@ bool wxDbTable::Refresh(void) } // wxDbTable::Refresh() -/********** wxDbTable::SetColNull(int colNo, bool set) **********/ -bool wxDbTable::SetColNull(int colNo, bool set) +/********** wxDbTable::SetColNull() **********/ +bool wxDbTable::SetColNull(UWORD colNo, bool set) { if (colNo < noCols) { @@ -2329,7 +2329,7 @@ bool wxDbTable::SetColNull(int colNo, bool set) } // wxDbTable::SetColNull() -/********** wxDbTable::SetColNull(const wxString &colName, bool set) **********/ +/********** wxDbTable::SetColNull() **********/ bool wxDbTable::SetColNull(const wxString &colName, bool set) { int i;