X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f850e28314ba5c1a020b3853b71f3e8520b04fe..dd4e6da0e0abb643e10d3a2c83b063138bec0d69:/include/wx/dataview.h?ds=sidebyside diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 84fe95f175..f6756133b1 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -21,8 +21,18 @@ #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 // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- @@ -37,23 +47,23 @@ 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: public wxObject @@ -61,25 +71,26 @@ 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 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 { @@ -89,7 +100,7 @@ public: m_viewColumn = view_column; m_modelColumn = model_column; } - + wxDataViewColumn *m_viewColumn; size_t m_modelColumn; }; @@ -105,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; @@ -116,15 +127,16 @@ public: 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 + // 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; @@ -132,9 +144,9 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewListModel) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewSortedListModel -// --------------------------------------------------------- +// --------------------------------------------------------- typedef int (wxCALLBACK *wxDataViewListModelCompare) (size_t row1, size_t row2, size_t col, wxDataViewListModel* model ); @@ -152,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 ); @@ -163,21 +175,25 @@ public: 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 { @@ -199,15 +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; } - - 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; @@ -217,9 +234,9 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCellBase) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewColumnBase -// --------------------------------------------------------- +// --------------------------------------------------------- enum wxDataViewColumnFlags { @@ -228,22 +245,35 @@ enum wxDataViewColumnFlags wxDATAVIEW_COL_HIDDEN = 4 }; +enum wxDataViewColumnSizing +{ + wxDATAVIEW_COL_WIDTH_FIXED, + wxDATAVIEW_COL_WIDTH_AUTO, + wxDATAVIEW_COL_WIDTH_GROW +}; + class 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; @@ -256,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 { 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; @@ -287,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