X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e938ff5e2013d1181d2eb740f1c9836fc0dc7575..b1f5d087c78df77408b3b2774695b1e0d148e6fb:/include/wx/dbtable.h?ds=sidebyside

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 8c51ceb508..c23c72370d 100644
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -28,22 +28,16 @@
 #ifndef DBTABLE_DOT_H
 #define DBTABLE_DOT_H
 
-// Use this line for wxWindows v1.x
-//#include "wx_ver.h"
-// Use this line for wxWindows v2.x
 #include "wx/version.h"
 
-#if wxMAJOR_VERSION == 2
-    #ifdef __GNUG__
-        #pragma interface "dbtable.h"
-    #endif
+#ifdef __GNUG__
+  #pragma interface "dbtable.h"
 #endif
 
-#if wxMAJOR_VERSION == 2
-    #include "wx/db.h"
-#else
-    #include "db.h"
-#endif
+#include "wx/db.h"
+
+#include "wx/variant.h"
+#include "wx/dbkeyg.h"
 
 const int   wxDB_ROWID_LEN       = 24;  // 18 is the max, 24 is in case it gets larger
 const int   wxDB_DEFAULT_CURSOR  = 0;
@@ -208,7 +202,7 @@ public:
     bool            Open(bool checkPrivileges=FALSE, bool checkTableExists=TRUE);
     bool            CreateTable(bool attemptDrop=TRUE);
     bool            DropTable(void);
-    bool            CreateIndex(const wxString &idxName, bool unique, int noIdxCols, 
+    bool            CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCols, 
                                 wxDbIdxDef *pIdxDefs, bool attemptDrop=TRUE);
     bool            DropIndex(const wxString &idxName);
 
@@ -301,11 +295,11 @@ public:
     bool            SetQueryTimeout(UDWORD nSeconds);
 
     wxDbColDef     *GetColDefs() { return colDefs; }
-    void            SetColDefs(int index, const wxString &fieldName, int dataType, 
+    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);
-    wxDbColDataPtr *SetColDefs(wxDbColInf *colInfs, ULONG numCols);
+    wxDbColDataPtr *SetColDefs(wxDbColInf *colInfs, UWORD numCols);
 
     bool            CloseCursor(HSTMT cursor);
     bool            DeleteCursor(HSTMT *hstmtDel);
@@ -320,7 +314,7 @@ public:
     ULONG           Count(const wxString &args="*");
     int             DB_STATUS(void) { return(pDb->DB_STATUS); }
 
-    bool            IsColNull(UWORD colNo);
+    bool            IsColNull(UWORD colNo) const;
     bool            SetColNull(UWORD colNo, bool set=TRUE);
     bool            SetColNull(const wxString &colName, bool set=TRUE);
 #if wxODBC_BACKWARD_COMPATABILITY
@@ -332,6 +326,32 @@ public:
     ULONG           GetTableID() { return tableID; }
 #endif
 
+//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     GenericKey   GetKey(void);
+    virtual     void         SetKey(const GenericKey &key);
+
+    private:
+        HSTMT      *m_hstmtGridQuery;
+        rowmode_t   m_rowmode;
+        size_t      m_keysize;
+
+//      typedef enum {unmodified=0, UpdatePending, InsertPending } recStatus;
+
+//      recStatus  get_ModifiedStatus() { return m_recstatus; }
+        
+//      void modify() {
+//          if (m_recstatus==unmodified)
+//              m_recstatus=UpdatePending;
+//      }
+//  protected:
+//      void insertify() {m_recstatus=InsertPending; }
+//      void unmodify() {m_recstatus=unmodified; }
+//      recStatus m_recstatus;
+//TODO: Need to Document
 };  // wxDbTable