listbox cleanup

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

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 7b2a64914f24c36260b935ed3e2445e74efa558f..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
 
@@ -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