Changed the 'true's and 'false's back to TRUE and FALSE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -98,7 +98,7 @@ enum enumDummy {enumDum1};
|
||||
#define SQL_C_BLOB SQL_VARBINARY
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
#ifndef TRUE
|
||||
#define TRUE true
|
||||
#endif
|
||||
@@ -106,7 +106,7 @@ enum enumDummy {enumDum1};
|
||||
#ifndef FALSE
|
||||
#define FALSE false
|
||||
#endif
|
||||
|
||||
*/
|
||||
const int wxDB_PATH_MAX = 254;
|
||||
|
||||
extern wxChar const *SQL_LOG_FILENAME;
|
||||
@@ -586,7 +586,7 @@ public:
|
||||
bool DispAllErrors(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT);
|
||||
bool GetNextError(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT);
|
||||
void DispNextError(void);
|
||||
bool CreateView(const wxString &viewName, const wxString &colList, const wxString &pSqlStmt, bool attemptDrop=true);
|
||||
bool CreateView(const wxString &viewName, const wxString &colList, const wxString &pSqlStmt, bool attemptDrop=TRUE);
|
||||
bool DropView(const wxString &viewName);
|
||||
bool ExecSql(const wxString &pSqlStmt);
|
||||
bool GetNext(void);
|
||||
@@ -628,7 +628,7 @@ public:
|
||||
{ logError(errMsg, SQLState); }
|
||||
void SetDebugErrorMessages(bool state) { silent = !state; }
|
||||
bool SetSqlLogging(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME,
|
||||
bool append = false);
|
||||
bool append = FALSE);
|
||||
bool WriteSqlLog(const wxString &logMsg);
|
||||
|
||||
wxDBMS Dbms(void);
|
||||
@@ -697,7 +697,7 @@ bool WXDLLEXPORT wxDbSqlLog(wxDbSqlLogState state, const wxString &filename =
|
||||
#if 0
|
||||
// MSW/VC6 ONLY!!! Experimental
|
||||
int WXDLLEXPORT wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const wxString &description=wxEmptyString,
|
||||
bool sysDSN=false, const wxString &defDir=wxEmptyString, wxWindow *parent=NULL);
|
||||
bool sysDSN=FALSE, const wxString &defDir=wxEmptyString, wxWindow *parent=NULL);
|
||||
#endif
|
||||
|
||||
// This routine allows you to query a driver manager
|
||||
|
@@ -106,7 +106,7 @@ class wxDbGridTableBase : public wxGridTableBase
|
||||
{
|
||||
public:
|
||||
wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,
|
||||
int count = wxUSE_QUERY, bool takeOwnership = true);
|
||||
int count = wxUSE_QUERY, bool takeOwnership = TRUE);
|
||||
~wxDbGridTableBase();
|
||||
|
||||
virtual int GetNumberRows()
|
||||
@@ -138,12 +138,12 @@ public:
|
||||
|
||||
virtual wxString wxDbGridTableBase::GetColLabelValue(int col);
|
||||
|
||||
virtual bool AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=true);
|
||||
virtual bool AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=TRUE);
|
||||
virtual void ValidateRow(int row);
|
||||
virtual bool UpdateRow(int row) const
|
||||
{
|
||||
if (m_row != row)
|
||||
return true;
|
||||
return TRUE;
|
||||
else
|
||||
return Writeback();
|
||||
}
|
||||
|
@@ -41,8 +41,8 @@
|
||||
|
||||
const int wxDB_ROWID_LEN = 24; // 18 is the max, 24 is in case it gets larger
|
||||
const int wxDB_DEFAULT_CURSOR = 0;
|
||||
const bool wxDB_QUERY_ONLY = true;
|
||||
const bool wxDB_DISABLE_VIEW = true;
|
||||
const bool wxDB_QUERY_ONLY = TRUE;
|
||||
const bool wxDB_DISABLE_VIEW = TRUE;
|
||||
|
||||
// Used to indicate end of a variable length list of
|
||||
// column numbers passed to member functions
|
||||
@@ -64,7 +64,7 @@ public:
|
||||
SWORD SqlCtype; // C data type; e.g. SQL_C_LONG
|
||||
void *PtrDataObj; // Address of the data object
|
||||
int SzDataObj; // Size, in bytes, of the data object
|
||||
bool KeyField; // true if this column is part of the PRIMARY KEY to the table; Date fields should NOT be KeyFields.
|
||||
bool KeyField; // TRUE if this column is part of the PRIMARY KEY to the table; Date fields should NOT be KeyFields.
|
||||
bool Updateable; // Specifies whether this column is updateable
|
||||
bool InsertAllowed; // Specifies whether this column should be included in an INSERT statement
|
||||
bool DerivedCol; // Specifies whether this column is a derived value
|
||||
@@ -199,11 +199,11 @@ public:
|
||||
|
||||
virtual ~wxDbTable();
|
||||
|
||||
bool Open(bool checkPrivileges=false, bool checkTableExists=true);
|
||||
bool CreateTable(bool attemptDrop=true);
|
||||
bool Open(bool checkPrivileges=FALSE, bool checkTableExists=TRUE);
|
||||
bool CreateTable(bool attemptDrop=TRUE);
|
||||
bool DropTable(void);
|
||||
bool CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCols,
|
||||
wxDbIdxDef *pIdxDefs, bool attemptDrop=true);
|
||||
wxDbIdxDef *pIdxDefs, bool attemptDrop=TRUE);
|
||||
bool DropIndex(const wxString &idxName);
|
||||
|
||||
// Accessors
|
||||
@@ -246,10 +246,10 @@ public:
|
||||
bool Delete(void);
|
||||
bool DeleteWhere(const wxString &pWhereClause);
|
||||
bool DeleteMatching(void);
|
||||
virtual bool Query(bool forUpdate = false, bool distinct = false);
|
||||
virtual bool Query(bool forUpdate = FALSE, bool distinct = FALSE);
|
||||
bool QueryBySqlStmt(const wxString &pSqlStmt);
|
||||
bool QueryMatching(bool forUpdate = false, bool distinct = false);
|
||||
bool QueryOnKeyFields(bool forUpdate = false, bool distinct = false);
|
||||
bool QueryMatching(bool forUpdate = FALSE, bool distinct = FALSE);
|
||||
bool QueryOnKeyFields(bool forUpdate = FALSE, bool distinct = FALSE);
|
||||
bool Refresh(void);
|
||||
bool GetNext(void) { return(getRec(SQL_FETCH_NEXT)); }
|
||||
bool operator++(int) { return(getRec(SQL_FETCH_NEXT)); }
|
||||
@@ -273,8 +273,8 @@ public:
|
||||
void BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxString &pWhereClause="");
|
||||
void BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpd, const wxString &pWhereClause="");
|
||||
|
||||
void BuildWhereClause(wxString &pWhereClause, int typeOfWhere, const wxString &qualTableName="", bool useLikeComparison=false);
|
||||
void BuildWhereClause(wxChar *pWhereClause, int typeOfWhere, const wxString &qualTableName="", bool useLikeComparison=false);
|
||||
void BuildWhereClause(wxString &pWhereClause, int typeOfWhere, const wxString &qualTableName="", bool useLikeComparison=FALSE);
|
||||
void BuildWhereClause(wxChar *pWhereClause, int typeOfWhere, const wxString &qualTableName="", bool useLikeComparison=FALSE);
|
||||
|
||||
#if wxODBC_BACKWARD_COMPATABILITY
|
||||
// The following member functions are deprecated. You should use the BuildXxxxxStmt functions (above)
|
||||
@@ -285,42 +285,42 @@ public:
|
||||
void GetUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause = NULL)
|
||||
{ BuildUpdateStmt(pSqlStmt,typeOfUpd,pWhereClause); }
|
||||
void GetWhereClause(char *pWhereClause, int typeOfWhere,
|
||||
const char *qualTableName = NULL, bool useLikeComparison=false)
|
||||
const char *qualTableName = NULL, bool useLikeComparison=FALSE)
|
||||
{ BuildWhereClause(pWhereClause,typeOfWhere,qualTableName,useLikeComparison); }
|
||||
#endif
|
||||
bool CanSelectForUpdate(void);
|
||||
bool CanUpdByROWID(void);
|
||||
void ClearMemberVar(UWORD colNo, bool setToNull=false);
|
||||
void ClearMemberVars(bool setToNull=false);
|
||||
void ClearMemberVar(UWORD colNo, bool setToNull=FALSE);
|
||||
void ClearMemberVars(bool setToNull=FALSE);
|
||||
bool SetQueryTimeout(UDWORD nSeconds);
|
||||
|
||||
wxDbColDef *GetColDefs() { return colDefs; }
|
||||
void SetColDefs(UWORD index, const wxString &fieldName, int dataType,
|
||||
void *pData, SWORD cType,
|
||||
int size, bool keyField = false, bool upd = true,
|
||||
bool insAllow = true, bool derivedCol = false);
|
||||
int size, bool keyField = FALSE, bool upd = TRUE,
|
||||
bool insAllow = TRUE, bool derivedCol = FALSE);
|
||||
wxDbColDataPtr *SetColDefs(wxDbColInf *colInfs, UWORD numCols);
|
||||
|
||||
bool CloseCursor(HSTMT cursor);
|
||||
bool DeleteCursor(HSTMT *hstmtDel);
|
||||
void SetCursor(HSTMT *hstmtActivate = (void **) wxDB_DEFAULT_CURSOR);
|
||||
HSTMT GetCursor(void) { return(hstmt); }
|
||||
HSTMT *GetNewCursor(bool setCursor = false, bool bindColumns = true);
|
||||
HSTMT *GetNewCursor(bool setCursor = FALSE, bool bindColumns = TRUE);
|
||||
#if wxODBC_BACKWARD_COMPATABILITY
|
||||
// The following member function is deprecated. You should use the GetNewCursor
|
||||
HSTMT *NewCursor(bool setCursor = false, bool bindColumns = true) { return GetNewCursor(setCursor,bindColumns); }
|
||||
HSTMT *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE) { return GetNewCursor(setCursor,bindColumns); }
|
||||
#endif
|
||||
|
||||
ULONG Count(const wxString &args="*");
|
||||
int DB_STATUS(void) { return(pDb->DB_STATUS); }
|
||||
|
||||
bool IsColNull(UWORD colNo) const;
|
||||
bool SetColNull(UWORD colNo, bool set=true);
|
||||
bool SetColNull(const wxString &colName, bool set=true);
|
||||
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()
|
||||
bool SetNull(int colNo, bool set=true) { return (SetNull(colNo,set)); }
|
||||
bool SetNull(const char *colName, bool set=true) { return (SetNull(colName,set)); }
|
||||
bool SetNull(int colNo, bool set=TRUE) { return (SetNull(colNo,set)); }
|
||||
bool SetNull(const char *colName, bool set=TRUE) { return (SetNull(colName,set)); }
|
||||
#endif
|
||||
#ifdef __WXDEBUG__
|
||||
ULONG GetTableID() { return tableID; }
|
||||
|
Reference in New Issue
Block a user