compilation fix for wxUSE_STL==1 build

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

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 463c1f3caf71872440ecfb88d1be08692adb944a..8d7de7322cbbd5e3ee139ff72fc4ebf7d3afb327 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,8 +55,9 @@ 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!!! For parameter bindings
     bool    Null;                               // NOT FULLY IMPLEMENTED - Allows NULL values in Inserts and Updates
+    SQLLEN  CbValueCol;                         // Internal use only!!! For column bindings
 
     wxDbColDef();
 
@@ -184,14 +181,6 @@ public:
               const wxString &qryTblName=wxEmptyString, bool qryOnly = !wxDB_QUERY_ONLY,
               const wxString &tblPath=wxEmptyString);
 
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED(
-        wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
-                  const wxChar *qryTblName, bool qryOnly,
-                  const wxString &tblPath)
-    );
-#endif // WXWIN_COMPATIBILITY_2_4
-
     virtual ~wxDbTable();
 
     bool            Open(bool checkPrivileges=false, bool checkTableExists=true);
@@ -360,7 +349,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