X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abfcca57dd0d805ceec9e19c4be207614d79252a..e4277538a535d6d6c049f0b0ead9ed2b07cd93f2:/include/wx/dbgrid.h?ds=sidebyside diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h index 066186665b..901af313c3 100644 --- a/include/wx/dbgrid.h +++ b/include/wx/dbgrid.h @@ -14,12 +14,8 @@ #ifndef _WX_GENERIC_DBGRID_H_ #define _WX_GENERIC_DBGRID_H_ -#ifdef __GNUG__ - #pragma interface "dbgrid.h" -#endif - #if wxUSE_ODBC -#if wxUSE_NEW_GRID +#if wxUSE_GRID #include "wx/log.h" #include "wx/dbtable.h" @@ -29,11 +25,11 @@ #define wxGRID_VALUE_DBAUTO _T("dbauto") -WX_DECLARE_OBJARRAY(GenericKey,keyarray); +WX_DECLARE_USER_EXPORTED_OBJARRAY(GenericKey,keyarray,WXDLLIMPEXP_DBGRID); static const int wxUSE_QUERY = -1; -class wxDbGridColInfoBase +class WXDLLIMPEXP_DBGRID wxDbGridColInfoBase { public: //Default ctor @@ -60,7 +56,7 @@ public: }; -class wxDbGridColInfo +class WXDLLIMPEXP_DBGRID wxDbGridColInfo { public: wxDbGridColInfo(int colNo, @@ -78,6 +74,18 @@ public: //Recurse to find length. int Length() { return (m_next ? m_next->Length() +1 : 1); } + // Adds a new column info (2 step creation) + void AddColInfo (int colNo, + wxString type, + wxString title) + { + GetLast()->m_next = new wxDbGridColInfo (colNo, type, title, NULL); + } + + // Searches last + wxDbGridColInfo *GetLast() { return (m_next ? m_next->GetLast() : this); } + + protected: wxDbGridColInfoBase m_data; wxDbGridColInfo *m_next; @@ -86,7 +94,7 @@ public: }; -class wxDbGridCellAttrProvider : public wxGridCellAttrProvider +class WXDLLIMPEXP_DBGRID wxDbGridCellAttrProvider : public wxGridCellAttrProvider { public: wxDbGridCellAttrProvider(); @@ -102,21 +110,21 @@ private: }; -class wxDbGridTableBase : public wxGridTableBase +class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase { public: wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo, - int count = wxUSE_QUERY, bool takeOwnership = TRUE); + int count = wxUSE_QUERY, bool takeOwnership = true); ~wxDbGridTableBase(); virtual int GetNumberRows() { - wxLogDebug(" GetNumberRows() = %i",m_rowtotal); + wxLogDebug(_T(" GetNumberRows() = %i"),m_rowtotal); return m_rowtotal; } virtual int GetNumberCols() { - wxLogDebug(" GetNumberCols() = %i",m_nocols); + wxLogDebug(_T(" GetNumberCols() = %i"),m_nocols); return m_nocols; } virtual bool IsEmptyCell(int row, int col) ; @@ -138,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(); } @@ -163,7 +171,7 @@ private: bool m_rowmodified; }; -#endif // #if wxUSE_NEW_GRID +#endif // #if wxUSE_GRID #endif // #if wxUSE_ODBC #endif // _WX_GENERIC_DBGRID_H_