X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..69357fa0cb9bacb2c537837d27f11883a82b2425:/include/wx/dbgrid.h diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h index 954655b1c9..b08f2c6bcb 100644 --- a/include/wx/dbgrid.h +++ b/include/wx/dbgrid.h @@ -14,10 +14,6 @@ #ifndef _WX_GENERIC_DBGRID_H_ #define _WX_GENERIC_DBGRID_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "dbgrid.h" -#endif - #if wxUSE_ODBC #if wxUSE_GRID @@ -29,7 +25,7 @@ #define wxGRID_VALUE_DBAUTO _T("dbauto") -WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray); +WX_DECLARE_USER_EXPORTED_OBJARRAY(GenericKey,keyarray,WXDLLIMPEXP_DBGRID); static const int wxUSE_QUERY = -1; @@ -118,8 +114,8 @@ class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase { public: wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo, - int count = wxUSE_QUERY, bool takeOwnership = TRUE); - ~wxDbGridTableBase(); + int count = wxUSE_QUERY, bool takeOwnership = true); + virtual ~wxDbGridTableBase(); virtual int GetNumberRows() { @@ -150,12 +146,12 @@ public: virtual wxString GetColLabelValue(int col); - virtual bool AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=TRUE); + virtual bool AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=true); virtual void ValidateRow(int row); virtual bool UpdateRow(int row) const { if (m_row != row) - return TRUE; + return true; else return Writeback(); }