define __WXFUNCTION__ instead of redefining the (semi-)standard __FUNCTION__ which...

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

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 36e94cb5fd30e3dd4a61fa391a1b6174146e3498..5e7ff175546bb831672142bf543598f92623aecd 100644 (file)
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -19,11 +19,7 @@
 #ifndef DBTABLE_DOT_H
 #define DBTABLE_DOT_H
 
-#include "wx/version.h"
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma interface "dbtable.h"
-#endif
+#include "wx/defs.h"
 
 #include "wx/db.h"
 
@@ -59,7 +55,7 @@ public:
     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
-    SDWORD  CbValue;                            // Internal use only!!!
+    SQLLEN  CbValue;                            // Internal use only!!!
     bool    Null;                               // NOT FULLY IMPLEMENTED - Allows NULL values in Inserts and Updates
 
     wxDbColDef();
@@ -187,8 +183,8 @@ public:
 #if WXWIN_COMPATIBILITY_2_4
     wxDEPRECATED(
         wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
-                  const wxChar *qryTblName=wxEmptyString, bool qryOnly = !wxDB_QUERY_ONLY,
-                  const wxString &tblPath=wxEmptyString)
+                  const wxChar *qryTblName, bool qryOnly,
+                  const wxString &tblPath)
     );
 #endif // WXWIN_COMPATIBILITY_2_4
 
@@ -197,9 +193,9 @@ public:
     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);
-    bool            DropIndex(const wxString &idxName);
+    bool            CreateIndex(const wxString &indexName, bool unique, UWORD numIndexColumns,
+                                wxDbIdxDef *pIndexDefs, bool attemptDrop=true);
+    bool            DropIndex(const wxString &indexName);
 
     // Accessors
 
@@ -265,8 +261,8 @@ public:
     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=wxEmptyString);
-    void            BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpd, const wxString &pWhereClause=wxEmptyString);
+    void            BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpdate, const wxString &pWhereClause=wxEmptyString);
+    void            BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpdate, const wxString &pWhereClause=wxEmptyString);
 
     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);
@@ -277,8 +273,8 @@ public:
                            { BuildSelectStmt(pSqlStmt,typeOfSelect,distinct); }
     void            GetDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause = NULL)
                            { BuildDeleteStmt(pSqlStmt,typeOfDel,pWhereClause); }
-    void            GetUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause = NULL)
-                           { BuildUpdateStmt(pSqlStmt,typeOfUpd,pWhereClause); }
+    void            GetUpdateStmt(char *pSqlStmt, int typeOfUpdate, const char *pWhereClause = NULL)
+                           { BuildUpdateStmt(pSqlStmt,typeOfUpdate,pWhereClause); }
     void            GetWhereClause(char *pWhereClause, int typeOfWhere,
                                    const char *qualTableName = NULL, bool useLikeComparison=false)
                            { BuildWhereClause(pWhereClause,typeOfWhere,qualTableName,useLikeComparison); }
@@ -295,8 +291,8 @@ public:
     wxDbColDef     *GetColDefs() { return colDefs; }
     bool            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 updateable = true,
+                               bool insertAllowed = true, bool derivedColumn = false);
     wxDbColDataPtr *SetColDefs(wxDbColInf *colInfs, UWORD numCols);
 
     bool            CloseCursor(HSTMT cursor);
@@ -360,7 +356,7 @@ public:
 // Change this to 0 to remove use of all deprecated functions
 #if wxODBC_BACKWARD_COMPATABILITY
 //#################################################################################
-//############### DEPRECATED functions for backward compatability #################
+//############### DEPRECATED functions for backward compatibility #################
 //#################################################################################
 
 // Backward compability.  These will eventually go away