X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa28826dd3836d6d50c92ca8de1e97dd4c8cf3bc..e5f49cbf82c40fe1c7cc9806be06f6c1aff42659:/include/wx/dataview.h diff --git a/include/wx/dataview.h b/include/wx/dataview.h index fcb1dd20e4..8da38efc0a 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -21,55 +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 { @@ -79,45 +113,131 @@ public: virtual size_t GetNumberOfRows() = 0; virtual size_t GetNumberOfCols() = 0; - // as reported by wxVariant + // return type as reported by wxVariant virtual wxString GetColType( size_t col ) = 0; - virtual wxVariant GetValue( size_t col, size_t row ) = 0; + // get value into a wxVariant + 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 row, size_t col ); - 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) }; -// --------------------------------------------------------- -// wxDataViewColumn -// --------------------------------------------------------- +// --------------------------------------------------------- +// 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 ); -enum wxDataViewColumnType +class wxDataViewSortedListModel: public wxDataViewListModel { - wxDATAVIEW_COL_TEXT, - wxDATAVIEW_COL_ICON, - wxDATAVIEW_COL_ICONTEXT, - wxDATAVIEW_COL_CHECK, - wxDATAVIEW_COL_DATETIME, - wxDATAVIEW_COL_PROGRESS, - wxDATAVIEW_COL_CHOICE, - wxDATAVIEW_COL_CUSTOM +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 +{ + wxDATAVIEW_CELL_INERT, + wxDATAVIEW_CELL_ACTIVATABLE, + wxDATAVIEW_CELL_EDITABLE }; +enum wxDataViewCellRenderState +{ + wxDATAVIEW_CELL_SELECTED = 1, + wxDATAVIEW_CELL_PRELIT = 2, + wxDATAVIEW_CELL_INSENSITIVE = 4, + wxDATAVIEW_CELL_FOCUSED = 8 +}; + +class wxDataViewCellBase: public wxObject +{ +public: + wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); + + 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; + wxDataViewColumn *m_owner; + +protected: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCellBase) +}; + +// --------------------------------------------------------- +// wxDataViewColumnBase +// --------------------------------------------------------- + enum wxDataViewColumnFlags { wxDATAVIEW_COL_RESIZABLE = 1, @@ -128,25 +248,34 @@ enum wxDataViewColumnFlags class wxDataViewColumnBase: public wxObject { public: - wxDataViewColumnBase( const wxString &title, wxDataViewCtrl *ctrl, - wxDataViewColumnType kind, int flags = 0 ); + wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, 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; } + private: wxDataViewCtrl *m_ctrl; - wxDataViewColumnType m_kind; + wxDataViewCell *m_cell; + int m_model_column; int m_flags; wxString m_title; + wxDataViewCtrl *m_owner; protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumnBase) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewCtrlBase -// --------------------------------------------------------- +// --------------------------------------------------------- class wxDataViewCtrlBase: public wxControl { @@ -154,17 +283,19 @@ public: wxDataViewCtrlBase(); ~wxDataViewCtrlBase(); - virtual bool AssociateModel( wxDataViewListModel *model ); wxDataViewListModel* GetModel(); - - virtual bool AppendStringColumn( const wxString &label ); - 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; @@ -173,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"