Fixed OS/2 compilation problems.

[wxWidgets.git] / include / wx / dbtable.h

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 9c990ebfe3e8a82eeb0d94fcbf6e37d0b98510e2..d228f64a6d1cc3bd48b8ef9ca194138b43b79018 100644 (file)
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -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 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
 
 // 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
     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
     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();
 
 
     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, 
     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
     bool            DropIndex(const wxString &idxName);
 
     // Accessors


@@ -246,10 +246,10 @@ public:
     bool            Delete(void);
     bool            DeleteWhere(const wxString &pWhereClause);
     bool            DeleteMatching(void);
     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            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));  }
     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            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)
 
 #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, 
     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);
                            { 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,
     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); }
     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
 #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;
 #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()
 #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; }
 #endif
 #ifdef __WXDEBUG__
     ULONG           GetTableID() { return tableID; }


@@ -329,8 +329,8 @@ public:
 //TODO: Need to Document
     typedef     enum  { WX_ROW_MODE_QUERY , WX_ROW_MODE_INDIVIDUAL } rowmode_t;
     virtual     void         SetRowMode(const rowmode_t rowmode);
 //TODO: Need to Document
     typedef     enum  { WX_ROW_MODE_QUERY , WX_ROW_MODE_INDIVIDUAL } rowmode_t;
     virtual     void         SetRowMode(const rowmode_t rowmode);

-    virtual     wxVariant    GetCol(const int Colno) const ;
-    virtual     void         SetCol(const int ColNo, const wxVariant value);
+    virtual     wxVariant    GetCol(const int colNo) const ;
+    virtual     void         SetCol(const int colNo, const wxVariant value);

     virtual     GenericKey   GetKey(void);
     virtual     void         SetKey(const GenericKey &key);
 
     virtual     GenericKey   GetKey(void);
     virtual     void         SetKey(const GenericKey &key);