Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A couple more 'int' to UWORD conversions I had not merged into my previous checkin.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-04-11 14:37:48 +00:00
parent 3fe813a9ad
commit e938ff5e20
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/dbtable.h
View File

@@ -236,7 +236,7 @@ public:
#else #else
void SetFromClause(const wxString &From) { from = From; } void SetFromClause(const wxString &From) { from = From; }
void SetOrderByClause(const wxString &OrderBy) { orderBy = OrderBy; } void SetOrderByClause(const wxString &OrderBy) { orderBy = OrderBy; }
bool SetOrderByColNums(int first, ...); bool SetOrderByColNums(UWORD first, ...);
void SetWhereClause(const wxString &Where) { where = Where; } void SetWhereClause(const wxString &Where) { where = Where; }
void From(const wxString &From) { from = From; } void From(const wxString &From) { from = From; }
void OrderBy(const wxString &OrderBy) { orderBy = OrderBy; } void OrderBy(const wxString &OrderBy) { orderBy = OrderBy; }
@@ -296,7 +296,7 @@ public:
#endif #endif
bool CanSelectForUpdate(void); bool CanSelectForUpdate(void);
bool CanUpdByROWID(void); bool CanUpdByROWID(void);
void ClearMemberVar(int colNo, bool setToNull=FALSE); void ClearMemberVar(UWORD colNo, bool setToNull=FALSE);
void ClearMemberVars(bool setToNull=FALSE); void ClearMemberVars(bool setToNull=FALSE);
bool SetQueryTimeout(UDWORD nSeconds); bool SetQueryTimeout(UDWORD nSeconds);
@@ -320,8 +320,8 @@ public:
ULONG Count(const wxString &args="*"); ULONG Count(const wxString &args="*");
int DB_STATUS(void) { return(pDb->DB_STATUS); } int DB_STATUS(void) { return(pDb->DB_STATUS); }
bool IsColNull(int colNo); bool IsColNull(UWORD colNo);
bool SetColNull(int colNo, bool set=TRUE); bool SetColNull(UWORD colNo, bool set=TRUE);
bool SetColNull(const wxString &colName, bool set=TRUE); bool SetColNull(const wxString &colName, bool set=TRUE);
#if wxODBC_BACKWARD_COMPATABILITY #if wxODBC_BACKWARD_COMPATABILITY
// The following member functions are deprecated. You should use the SetColNull() // The following member functions are deprecated. You should use the SetColNull()

6
src/common/db.cpp
View File

@@ -2105,7 +2105,7 @@ wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
*/ */
{ {
UWORD noCols = 0; UWORD noCols = 0;
int colNo = 0; UWORD colNo = 0;
wxDbColInf *colInf = 0; wxDbColInf *colInf = 0;
RETCODE retcode; RETCODE retcode;
@@ -2263,7 +2263,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, UWORD *numCols, const wx
{ {
UWORD noCols = 0; UWORD noCols = 0;
int colNo = 0; UWORD colNo = 0;
wxDbColInf *colInf = 0; wxDbColInf *colInf = 0;
RETCODE retcode; RETCODE retcode;
@@ -2518,7 +2518,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
// to avoid undesired unbinding of columns. // to avoid undesired unbinding of columns.
{ {
UWORD noCols = 0; UWORD noCols = 0;
int colNo = 0; UWORD colNo = 0;
wxDbColInf *colInf = 0; wxDbColInf *colInf = 0;
RETCODE retcode; RETCODE retcode;

14
src/common/dbtable.cpp
View File

@@ -1686,9 +1686,9 @@ bool wxDbTable::DropIndex(const wxString &idxName)
/********** wxDbTable::SetOrderByColNums() **********/ /********** 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; va_list argptr;
bool abort = FALSE; bool abort = FALSE;
@@ -1879,7 +1879,7 @@ bool wxDbTable::DeleteMatching(void)
/********** wxDbTable::IsColNull() **********/ /********** wxDbTable::IsColNull() **********/
bool wxDbTable::IsColNull(int colNo) bool wxDbTable::IsColNull(UWORD colNo)
{ {
/* /*
This logic is just not right. It would indicate TRUE This logic is just not right. It would indicate TRUE
@@ -1964,7 +1964,7 @@ bool wxDbTable::IsCursorClosedOnCommit(void)
/********** wxDbTable::ClearMemberVar() **********/ /********** wxDbTable::ClearMemberVar() **********/
void wxDbTable::ClearMemberVar(int colNo, bool setToNull) void wxDbTable::ClearMemberVar(UWORD colNo, bool setToNull)
{ {
wxASSERT(colNo < noCols); wxASSERT(colNo < noCols);
@@ -2313,8 +2313,8 @@ bool wxDbTable::Refresh(void)
} // wxDbTable::Refresh() } // wxDbTable::Refresh()
/********** wxDbTable::SetColNull(int colNo, bool set) **********/ /********** wxDbTable::SetColNull() **********/
bool wxDbTable::SetColNull(int colNo, bool set) bool wxDbTable::SetColNull(UWORD colNo, bool set)
{ {
if (colNo < noCols) if (colNo < noCols)
{ {
@@ -2329,7 +2329,7 @@ bool wxDbTable::SetColNull(int colNo, bool set)
} // wxDbTable::SetColNull() } // wxDbTable::SetColNull()
/********** wxDbTable::SetColNull(const wxString &colName, bool set) **********/ /********** wxDbTable::SetColNull() **********/
bool wxDbTable::SetColNull(const wxString &colName, bool set) bool wxDbTable::SetColNull(const wxString &colName, bool set)
{ {
int i; int i;