Mostly Mingw32/Cygwin corrections

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

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 291c62e3794316a86b0fd31bdb7e307fa1c33ce2..79cb77f90cce64e87a36d945c924c3feeb2c55e4 100644 (file)
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -95,8 +95,8 @@ private:
        bool bindUpdateParams(void);
        bool bindCols(HSTMT cursor);
        bool getRec(UWORD fetchType);
-       bool execDelete(char *pSqlStmt);
-       bool execUpdate(char *pSqlStmt);
+       bool execDelete(const char *pSqlStmt);
+       bool execUpdate(const char *pSqlStmt);
        bool query(int queryType, bool forUpdate, bool distinct, char *pSqlStmt = 0);
 
 public:
@@ -136,20 +136,20 @@ public:
 
        // Public member functions
        wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
-               const char *qryTblName = 0, bool qryOnly = !QUERY_ONLY, char *tblPath=NULL);
+               const char *qryTblName = 0, bool qryOnly = !QUERY_ONLY, const char *tblPath=NULL);
        virtual ~wxTable();
        bool    Open(void);
        bool    CreateTable(bool attemptDrop=TRUE);
        bool    DropTable(void);
-       bool    CreateIndex(char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs, bool attemptDrop=TRUE);
-       bool    DropIndex(char * idxName);
+       bool    CreateIndex(const char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs, bool attemptDrop=TRUE);
+       bool    DropIndex(const char * idxName);
        bool    CloseCursor(HSTMT cursor);
        int   Insert(void);
        bool    Update(void);
-       bool    Update(char *pSqlStmt);
-       bool    UpdateWhere(char *pWhereClause);
+       bool    Update(const char *pSqlStmt);
+       bool    UpdateWhere(const char *pWhereClause);
        bool    Delete(void);
-       bool    DeleteWhere(char *pWhereClause);
+       bool    DeleteWhere(const char *pWhereClause);
        bool    DeleteMatching(void);
        virtual bool Query(bool forUpdate = FALSE, bool distinct = FALSE);
        bool    QueryBySqlStmt(char *pSqlStmt);
@@ -157,24 +157,26 @@ public:
        bool    QueryOnKeyFields(bool forUpdate = FALSE, bool distinct = FALSE);
        bool    GetNext(void)   { return(getRec(SQL_FETCH_NEXT));  }
        bool    operator++(int) { return(getRec(SQL_FETCH_NEXT));  }
-#if !wxODBC_FWD_ONLY_CURSORS
-       bool    GetPrev(void)   { return(getRec(SQL_FETCH_PRIOR)); }
-       bool    operator--(int) { return(getRec(SQL_FETCH_PRIOR)); }
-       bool    GetFirst(void)  { return(getRec(SQL_FETCH_FIRST)); }
-       bool    GetLast(void)   { return(getRec(SQL_FETCH_LAST));  }
-#endif
+
+       /***** These four functions only work with wxDB instances that are defined  *****
+        ***** as not being FwdOnlyCursors                                          *****/
+       bool    GetPrev(void);
+       bool    operator--(int);
+       bool    GetFirst(void);
+       bool    GetLast(void);
+
        bool    IsCursorClosedOnCommit(void);
        bool    IsColNull(int colNo);
        UWORD GetRowNum(void);
        void  GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct);
-       void  GetDeleteStmt(char *pSqlStmt, int typeOfDel, char *pWhereClause = 0);
-       void  GetUpdateStmt(char *pSqlStmt, int typeOfUpd, char *pWhereClause = 0);
-       void  GetWhereClause(char *pWhereClause, int typeOfWhere, char *qualTableName = 0);
+       void  GetDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause = 0);
+       void  GetUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause = 0);
+       void  GetWhereClause(char *pWhereClause, int typeOfWhere, const char *qualTableName = 0);
        bool    CanSelectForUpdate(void);
        bool    CanUpdByROWID(void);
        void  ClearMemberVars(void);
        bool    SetQueryTimeout(UDWORD nSeconds);
-       void  SetColDefs (int index, char *fieldName, int dataType, void *pData, int cType,
+       void  SetColDefs (int index, const char *fieldName, int dataType, void *pData, int cType,
                                                        int size, bool keyField = FALSE, bool upd = TRUE,
                                                        bool insAllow = TRUE, bool derivedCol = FALSE);
        HSTMT *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE);
@@ -185,7 +187,7 @@ public:
        int   DB_STATUS(void) { return(pDb->DB_STATUS); }
        bool    Refresh(void);
        bool    SetNull(int colNo);
-       bool    SetNull(char *colName);
+       bool    SetNull(const char *colName);
 
 #ifdef __WXDEBUG__
        ULONG   GetTableID() { return tableID; };