Fixed size problem due to wxMac window implementation difference

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

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 8c51ceb508d86c7e1f4e57ecdbbfcd0107720d5a..8843cba083d93cd1fd0575bd84c50177141b46ec 100644 (file)
--- 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
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+  #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;
@@ -62,7 +56,7 @@ const int   wxDB_NO_MORE_COLUMN_NUMBERS = -1;
 // wxDbTable class which allows it to create a table in the data
 // source, exchange data between the data source and the C++
 // object, and so on.
-class WXDLLEXPORT wxDbColDef
+class WXDLLIMPEXP_ODBC wxDbColDef
 {
 public:
     wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1];  // Column Name
@@ -83,7 +77,7 @@ public:
 };  // wxDbColDef
 
 
-class WXDLLEXPORT wxDbColDataPtr
+class WXDLLIMPEXP_ODBC wxDbColDataPtr
 {
 public:
     void    *PtrDataObj;
@@ -93,7 +87,7 @@ public:
 
 
 // This structure is used when creating secondary indexes.
-class WXDLLEXPORT wxDbIdxDef
+class WXDLLIMPEXP_ODBC wxDbIdxDef
 {
 public:
     wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1];
@@ -101,7 +95,7 @@ public:
 };  // wxDbIdxDef
 
 
-class WXDLLEXPORT wxDbTable
+class WXDLLIMPEXP_ODBC wxDbTable
 {
 private:
     ULONG       tableID;  // Used for debugging.  This can help to match up mismatched constructors/destructors
@@ -195,20 +189,20 @@ public:
 #endif
     // Public member functions
     wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
-              const wxString &qryTblName="", bool qryOnly = !wxDB_QUERY_ONLY, 
-              const wxString &tblPath="");
+              const wxString &qryTblName=wxEmptyString, bool qryOnly = !wxDB_QUERY_ONLY, 
+              const wxString &tblPath=wxEmptyString);
 
     // DEPRECATED
     wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
-              const wxChar *qryTblName="", bool qryOnly = !wxDB_QUERY_ONLY, 
-              const wxString &tblPath="");
+              const wxChar *qryTblName=wxEmptyString, bool qryOnly = !wxDB_QUERY_ONLY, 
+              const wxString &tblPath=wxEmptyString);
 
     virtual ~wxDbTable();
 
     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);
 
@@ -273,14 +267,14 @@ public:
     void            BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool distinct);
     void            BuildSelectStmt(wxChar *pSqlStmt, int typeOfSelect, bool distinct);
 
-    void            BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxString &pWhereClause="");
-    void            BuildDeleteStmt(wxChar *pSqlStmt, int typeOfDel, const wxString &pWhereClause="");
+    void            BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxString &pWhereClause=wxEmptyString);
+    void            BuildDeleteStmt(wxChar *pSqlStmt, int typeOfDel, const wxString &pWhereClause=wxEmptyString);
 
-    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=wxEmptyString);
+    void            BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpd, const wxString &pWhereClause=wxEmptyString);
 
-    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=wxEmptyString, bool useLikeComparison=FALSE);
+    void            BuildWhereClause(wxChar *pWhereClause, int typeOfWhere, const wxString &qualTableName=wxEmptyString, bool useLikeComparison=FALSE);
 
 #if wxODBC_BACKWARD_COMPATABILITY
 // The following member functions are deprecated.  You should use the BuildXxxxxStmt functions (above)
@@ -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);
@@ -317,10 +311,10 @@ public:
     HSTMT          *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE) {  return GetNewCursor(setCursor,bindColumns); }
 #endif
 
-    ULONG           Count(const wxString &args="*");
+    ULONG           Count(const wxString &args=_T("*"));
     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