X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4eccd3a10f820927f6e75092b1ecb266da48f5f4..6bd719f16c64ac2757a40782b709d30e810d2eff:/include/wx/dataview.h?ds=inline diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 5d55449228..f9ef2529fd 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -21,47 +21,57 @@ #include "wx/bitmap.h" #include "wx/variant.h" + +#if defined(__WXGTK20__) + // for testing + #define wxUSE_GENERICDATAVIEWCTRL 1 +#elif defined(__WXMAC__) + #define wxUSE_GENERICDATAVIEWCTRL 1 +#else + #define wxUSE_GENERICDATAVIEWCTRL 1 +#endif + // ---------------------------------------------------------------------------- -// wxDataViewCtrl flags +// wxDataViewCtrl flags // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- // wxDataViewCtrl globals // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxDataViewModel; -class WXDLLIMPEXP_CORE wxDataViewListModel; -class WXDLLIMPEXP_CORE wxDataViewCtrl; -class WXDLLIMPEXP_CORE wxDataViewColumn; -class WXDLLIMPEXP_CORE wxDataViewCell; +class WXDLLIMPEXP_ADV wxDataViewModel; +class WXDLLIMPEXP_ADV wxDataViewListModel; +class WXDLLIMPEXP_ADV wxDataViewCtrl; +class WXDLLIMPEXP_ADV wxDataViewColumn; +class WXDLLIMPEXP_ADV wxDataViewCell; -extern WXDLLEXPORT_DATA(const wxChar) wxDataViewCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[]; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewModel -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewModel: public wxObject +class WXDLLIMPEXP_ADV wxDataViewModel: public wxObject { public: wxDataViewModel() { } virtual ~wxDataViewModel() { } - + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewModel) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewListModelNotifier -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewListModelNotifier: public wxObject +class WXDLLIMPEXP_ADV wxDataViewListModelNotifier: public wxObject { public: wxDataViewListModelNotifier() { } virtual ~wxDataViewListModelNotifier() { } - + virtual bool RowAppended() = 0; virtual bool RowPrepended() = 0; virtual bool RowInserted( size_t before ) = 0; @@ -70,19 +80,19 @@ public: virtual bool ValueChanged( size_t col, size_t row ) = 0; virtual bool RowsReordered( size_t *new_order ) = 0; virtual bool Cleared() = 0; - + void SetOwner( wxDataViewListModel *owner ) { m_owner = owner; } wxDataViewListModel *GetOwner() { return m_owner; } - + private: wxDataViewListModel *m_owner; }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewListModel -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewViewingColumn: public wxObject +class WXDLLIMPEXP_ADV wxDataViewViewingColumn: public wxObject { public: wxDataViewViewingColumn( wxDataViewColumn *view_column, size_t model_column ) @@ -90,12 +100,12 @@ public: m_viewColumn = view_column; m_modelColumn = model_column; } - + wxDataViewColumn *m_viewColumn; size_t m_modelColumn; }; -class wxDataViewListModel: public wxDataViewModel +class WXDLLIMPEXP_ADV wxDataViewListModel: public wxDataViewModel { public: wxDataViewListModel(); @@ -106,7 +116,7 @@ public: // return type as reported by wxVariant virtual wxString GetColType( size_t col ) = 0; // get value into a wxVariant - virtual wxVariant GetValue( size_t col, size_t row ) = 0; + virtual void GetValue( wxVariant &variant, size_t col, size_t row ) = 0; // set value, call ValueChanged() afterwards! virtual bool SetValue( wxVariant &variant, size_t col, size_t row ) = 0; @@ -120,13 +130,13 @@ public: virtual bool RowsReordered( size_t *new_order ); virtual bool Cleared(); - // Used internally + // Used internally virtual void AddViewingColumn( wxDataViewColumn *view_column, size_t model_column ); virtual void RemoveViewingColumn( wxDataViewColumn *column ); - + virtual void AddNotifier( wxDataViewListModelNotifier *notifier ); virtual void RemoveNotifier( wxDataViewListModelNotifier *notifier ); - + wxList m_notifiers; wxList m_viewingColumns; @@ -134,16 +144,16 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewListModel) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewSortedListModel -// --------------------------------------------------------- +// --------------------------------------------------------- typedef int (wxCALLBACK *wxDataViewListModelCompare) (size_t row1, size_t row2, size_t col, wxDataViewListModel* model ); -WX_DEFINE_SORTED_EXPORTED_ARRAY_SIZE_T(size_t, wxDataViewSortedIndexArray ); +WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxDataViewSortedIndexArray, WXDLLIMPEXP_ADV); -class wxDataViewSortedListModel: public wxDataViewListModel +class WXDLLIMPEXP_ADV wxDataViewSortedListModel: public wxDataViewListModel { public: wxDataViewSortedListModel( wxDataViewListModel *child ); @@ -154,7 +164,7 @@ public: // return type as reported by wxVariant virtual wxString GetColType( size_t col ); // get value into a wxVariant - virtual wxVariant GetValue( size_t col, size_t row ); + virtual void GetValue( wxVariant &variant, size_t col, size_t row ); // set value, call ValueChanged() afterwards! virtual bool SetValue( wxVariant &variant, size_t col, size_t row ); @@ -181,9 +191,9 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewSortedListModel) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewCellBase -// --------------------------------------------------------- +// --------------------------------------------------------- enum wxDataViewCellMode { @@ -200,20 +210,21 @@ enum wxDataViewCellRenderState wxDATAVIEW_CELL_FOCUSED = 8 }; -class wxDataViewCellBase: public wxObject +class WXDLLIMPEXP_ADV wxDataViewCellBase: public wxObject { public: wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); - virtual bool SetValue( const wxVariant &value ) { return true; } - virtual bool GetValue( wxVariant &value ) { return true; } - virtual bool Validate( wxVariant &value ) { return true; } - - wxString GetVariantType() { return m_variantType; } - + virtual bool SetValue( const wxVariant& WXUNUSED(value) ) { return true; } + virtual bool GetValue( wxVariant& WXUNUSED(value) ) { return true; } + virtual bool Validate( wxVariant& WXUNUSED(value) ) { return true; } + + wxString GetVariantType() { return m_variantType; } + wxDataViewCellMode GetMode() { return m_mode; } + void SetOwner( wxDataViewColumn *owner ) { m_owner = owner; } wxDataViewColumn* GetOwner() { return m_owner; } - + protected: wxDataViewCellMode m_mode; wxString m_variantType; @@ -223,9 +234,9 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCellBase) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewColumnBase -// --------------------------------------------------------- +// --------------------------------------------------------- enum wxDataViewColumnFlags { @@ -234,22 +245,35 @@ enum wxDataViewColumnFlags wxDATAVIEW_COL_HIDDEN = 4 }; -class wxDataViewColumnBase: public wxObject +enum wxDataViewColumnSizing +{ + wxDATAVIEW_COL_WIDTH_FIXED, + wxDATAVIEW_COL_WIDTH_AUTO, + wxDATAVIEW_COL_WIDTH_GROW +}; + +class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject { public: - wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags = 0 ); + wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, + int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 ); ~wxDataViewColumnBase(); virtual void SetTitle( const wxString &title ); virtual wxString GetTitle(); - + wxDataViewCell* GetCell() { return m_cell; } - + size_t GetModelColumn() { return m_model_column; } - + void SetOwner( wxDataViewCtrl *owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } + virtual int GetWidth() = 0; + + virtual void SetFixedWidth( int width ) = 0; + virtual int GetFixedWidth() = 0; + private: wxDataViewCtrl *m_ctrl; wxDataViewCell *m_cell; @@ -262,29 +286,32 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumnBase) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewCtrlBase -// --------------------------------------------------------- +// --------------------------------------------------------- + +#define wxDV_SINGLE 0x0000 // for convenience +#define wxDV_MULTIPLE 0x0020 // can select multiple items -class wxDataViewCtrlBase: public wxControl +class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxControl { public: wxDataViewCtrlBase(); ~wxDataViewCtrlBase(); - + virtual bool AssociateModel( wxDataViewListModel *model ); wxDataViewListModel* GetModel(); - + virtual bool AppendTextColumn( const wxString &label, size_t model_column ); virtual bool AppendToggleColumn( const wxString &label, size_t model_column ); virtual bool AppendProgressColumn( const wxString &label, size_t model_column ); virtual bool AppendDateColumn( const wxString &label, size_t model_column ); - virtual bool AppendColumn( wxDataViewColumn *col ); + virtual bool AppendColumn( wxDataViewColumn *col ); virtual size_t GetNumberOfColumns(); virtual bool DeleteColumn( size_t pos ); virtual bool ClearColumns(); virtual wxDataViewColumn* GetColumn( size_t pos ); - + private: wxDataViewListModel *m_model; wxList m_cols; @@ -293,10 +320,13 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase) }; -#if defined(__WXGTK20__) +#if defined(wxUSE_GENERICDATAVIEWCTRL) + #include "wx/generic/dataview.h" +#elif defined(__WXGTK20__) #include "wx/gtk/dataview.h" #elif defined(__WXMAC__) - #include "wx/mac/dataview.h" + // TODO + // #include "wx/mac/dataview.h" #else #include "wx/generic/dataview.h" #endif