X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7f61f762d284fb33d12d3b2e69f05675ab675c4..020e385d47a4a76f1d7246a9751c35e1001db38b:/include/wx/dataview.h diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 0b2ae8d09f..8da38efc0a 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -21,56 +21,89 @@ #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; extern WXDLLEXPORT_DATA(const wxChar) wxDataViewCtrlNameStr[]; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewModel -// --------------------------------------------------------- +// --------------------------------------------------------- class wxDataViewModel: public wxObject { public: wxDataViewModel() { } virtual ~wxDataViewModel() { } - + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewModel) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewListModelNotifier -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewListModelNotifier + +class wxDataViewListModelNotifier: public wxObject { public: wxDataViewListModelNotifier() { } virtual ~wxDataViewListModelNotifier() { } - + virtual bool RowAppended() = 0; virtual bool RowPrepended() = 0; virtual bool RowInserted( size_t before ) = 0; virtual bool RowDeleted( size_t row ) = 0; virtual bool RowChanged( size_t row ) = 0; - virtual bool ValueChanged( size_t row, size_t col ) = 0; + 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 +{ +public: + wxDataViewViewingColumn( wxDataViewColumn *view_column, size_t model_column ) + { + m_viewColumn = view_column; + m_modelColumn = model_column; + } + + wxDataViewColumn *m_viewColumn; + size_t m_modelColumn; +}; class wxDataViewListModel: public wxDataViewModel { @@ -83,32 +116,84 @@ 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; // delegated notifiers - bool RowAppended(); - bool RowPrepended(); - bool RowInserted( size_t before ); - bool RowDeleted( size_t row ); - bool RowChanged( size_t row ); - bool ValueChanged( size_t col, size_t row ); - bool Cleared(); - - void SetNotifier( wxDataViewListModelNotifier *notifier ); - wxDataViewListModelNotifier* GetNotifier(); - -private: - wxDataViewListModelNotifier *m_notifier; + virtual bool RowAppended(); + virtual bool RowPrepended(); + virtual bool RowInserted( size_t before ); + virtual bool RowDeleted( size_t row ); + virtual bool RowChanged( size_t row ); + virtual bool ValueChanged( size_t col, size_t row ); + virtual bool RowsReordered( size_t *new_order ); + virtual bool Cleared(); + + // 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; 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 ); + +class wxDataViewSortedListModel: public wxDataViewListModel +{ +public: + wxDataViewSortedListModel( wxDataViewListModel *child ); + virtual ~wxDataViewSortedListModel(); + + virtual size_t GetNumberOfRows(); + virtual size_t GetNumberOfCols(); + // return type as reported by wxVariant + virtual wxString GetColType( size_t col ); + // get value into a wxVariant + 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 ); + + // delegated notifiers + virtual bool RowAppended(); + virtual bool RowPrepended(); + virtual bool RowInserted( size_t before ); + virtual bool RowDeleted( size_t row ); + virtual bool RowChanged( size_t row ); + virtual bool ValueChanged( size_t col, size_t row ); + virtual bool RowsReordered( size_t *new_order ); + virtual bool Cleared(); + + bool ChildValueChanged( size_t col, size_t row ); + + virtual void Resort(); + +private: + wxDataViewListModel *m_child; + wxDataViewSortedIndexArray m_array; + wxDataViewListModelNotifier *m_notifierOnChild; + +protected: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewSortedListModel) +}; + +// --------------------------------------------------------- // wxDataViewCellBase -// --------------------------------------------------------- +// --------------------------------------------------------- enum wxDataViewCellMode { @@ -130,19 +215,16 @@ class 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; } - virtual bool BeginEdit() { return true; } - virtual bool EndEdit() { return true; } - - virtual bool Render( wxRect cell, wxRect exposed, wxDC *dc, int state ) { return true; } - + 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; } - - wxString GetVariantType() { return m_variantType; } - + protected: wxDataViewCellMode m_mode; wxString m_variantType; @@ -152,9 +234,9 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCellBase) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewColumnBase -// --------------------------------------------------------- +// --------------------------------------------------------- enum wxDataViewColumnFlags { @@ -171,11 +253,11 @@ public: 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; } @@ -191,26 +273,29 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumnBase) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewCtrlBase -// --------------------------------------------------------- +// --------------------------------------------------------- class wxDataViewCtrlBase: public wxControl { public: wxDataViewCtrlBase(); ~wxDataViewCtrlBase(); - + virtual bool AssociateModel( wxDataViewListModel *model ); wxDataViewListModel* GetModel(); - - virtual bool AppendStringColumn( const wxString &label, size_t model_column ); - virtual bool AppendColumn( wxDataViewColumn *col ); + + 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 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; @@ -219,7 +304,9 @@ 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"