X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..d8416992be62932d7dbc91a27a8bcf4b4a6db390:/include/wx/mac/carbon/dataview.h diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h index b825042f04..b6b22b356f 100644 --- a/include/wx/mac/carbon/dataview.h +++ b/include/wx/mac/carbon/dataview.h @@ -128,22 +128,22 @@ public: // virtual bool Render(wxRect cell, wxDC* dc, int state) = 0; - virtual bool Activate(wxRect WXUNUSED(cell), wxDataViewListModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row)) + virtual bool Activate(wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row)) { return false; } - virtual bool LeftClick(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewListModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row)) + virtual bool LeftClick(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row)) { return false; } - virtual bool RightClick(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewListModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row)) + virtual bool RightClick(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row)) { return false; } - virtual bool StartDrag(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewListModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row)) + virtual bool StartDrag(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row)) { return false; } @@ -179,7 +179,7 @@ public: return false; } - virtual bool StartEditing(unsigned int WXUNUSED(row), wxRect WXUNUSED(labelRect)) + virtual bool StartEditing(wxDataViewItem const& WXUNUSED(item), wxRect WXUNUSED(labelRect)) { return false; } @@ -193,7 +193,7 @@ public: // implementation // virtual bool Render(void); // declared in wxDataViewRenderer but will not be used here, therefore calling this function will - // return 'false' without having done anything + // return 'true' without having done anything virtual DataBrowserPropertyType GetPropertyType(void) const { @@ -281,6 +281,33 @@ private: // wxDataViewToggleRenderer // --------------------------------------------------------- +class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewRenderer +{ +public: + wxDataViewIconTextRenderer(wxString const& varianttype = wxT("wxDataViewIconText"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT); + +// +// inherited functions from wxDataViewRenderer +// + virtual bool Render(void); + +// +// implementation +// + virtual DataBrowserPropertyType GetPropertyType(void) const + { + return kDataBrowserIconAndTextType; + } + +protected: +private: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer) +}; + +// --------------------------------------------------------- +// wxDataViewToggleRenderer +// --------------------------------------------------------- + class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer { public: @@ -445,6 +472,10 @@ public: { this->m_propertyID = newID; } + void SetWidthVariable(int NewWidth) + { + this->m_width = NewWidth; + } protected: private: @@ -471,47 +502,79 @@ private: // --------------------------------------------------------- // wxDataViewCtrl // --------------------------------------------------------- - class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase { public: // Constructors / destructor: - wxDataViewCtrl() - { - this->Init(); - } - wxDataViewCtrl(wxWindow *parent, wxWindowID id, wxPoint const& pos = wxDefaultPosition, wxSize const& size = wxDefaultSize, long style = 0, - wxValidator const& validator = wxDefaultValidator) - { - this->Init(); - this->Create(parent, id, pos, size, style, validator ); - } - - bool Create(wxWindow *parent, wxWindowID id, wxPoint const& pos=wxDefaultPosition, wxSize const& size=wxDefaultSize, long style=0, - wxValidator const& validator=wxDefaultValidator); - - virtual bool AppendColumn(wxDataViewColumn* columnPtr); - - virtual bool AssociateModel(wxDataViewListModel* model); - - virtual void SetSelection( int row ); // -1 for unselect - virtual void SetSelectionRange( unsigned int from, unsigned int to ); - virtual void SetSelections( const wxArrayInt& aSelections); - virtual void Unselect( unsigned int row ); - - virtual bool IsSelected( unsigned int row ) const; - virtual int GetSelection() const; - virtual int GetSelections(wxArrayInt& aSelections) const; - - virtual wxControl* GetMainWindow(void) // should disappear as it is not of any use for the native implementation - { - return this; - } + wxDataViewCtrl() + { + this->Init(); + } + wxDataViewCtrl(wxWindow *parent, wxWindowID id, wxPoint const& pos = wxDefaultPosition, wxSize const& size = wxDefaultSize, long style = 0, + wxValidator const& validator = wxDefaultValidator) + { + this->Init(); + this->Create(parent, id, pos, size, style, validator ); + } + + // explicit control creation + bool Create(wxWindow *parent, wxWindowID id, wxPoint const& pos=wxDefaultPosition, wxSize const& size=wxDefaultSize, long style=0, + wxValidator const& validator=wxDefaultValidator); + + virtual wxControl* GetMainWindow(void) // should disappear as it is not of any use for the native implementation + { + return this; + } + + // inherited methods from 'wxDataViewCtrlBase': + virtual bool AssociateModel(wxDataViewModel* model); + + virtual bool AppendColumn(wxDataViewColumn* columnPtr); + virtual bool ClearColumns(void); + virtual bool DeleteColumn(wxDataViewColumn* columnPtr); + virtual wxDataViewColumn* GetColumn(unsigned int pos) const; + virtual unsigned int GetColumnCount(void) const; + virtual int GetColumnPosition(wxDataViewColumn const* columnPtr) const; + + virtual void Collapse(wxDataViewItem const& item); + virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr=NULL); + virtual void Expand(wxDataViewItem const& item); + + virtual wxDataViewColumn* GetSortingColumn(void) const; + + virtual unsigned int GetCount(void) const; + virtual wxRect GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const; + virtual wxDataViewItem GetSelection(void) const; + virtual int GetSelections(wxDataViewItemArray& sel) const; + + virtual void HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const; + + virtual bool IsSelected(wxDataViewItem const& item) const; + + virtual void SelectAll(void); + virtual void Select(wxDataViewItem const& item); + virtual void SetSelections(wxDataViewItemArray const& sel); + + virtual void Unselect(wxDataViewItem const& item); + virtual void UnselectAll(void); // // implementation // + // adds all children of the passed parent to the control; if 'parentItem' is invalid the root(s) is/are added: + void AddChildrenLevel(wxDataViewItem const& parentItem); + + // returns a pointer to a column; + // in case the pointer cannot be found NULL is returned: + wxDataViewColumn* GetColumnPtr(DataBrowserPropertyID propertyID) const; + + // checks if currently a delete process is running: + bool IsDeleting(void) const + { + return this->m_Deleting; + } + // with CG, we need to get the context from an kEventControlDraw event // unfortunately, the DataBrowser callbacks don't provide the context // and we need it, so we need to set/remove it before and after draw @@ -525,15 +588,24 @@ public: return this->m_cgContext; } - // reverts the sorting order of the hash map if wxDataViewColumn data and control data do not match; - // wxDataViewColumn data will NOT be updated - void ReverseSorting(DataBrowserPropertyID columnID); + /// sets the flag indicating a deletion process: + void SetDeleting(bool deleting) + { + this->m_Deleting = deleting; + } protected: + // inherited methods from wxDataViewCtrlBase: + virtual void DoSetExpanderColumn(void); + virtual void DoSetIndent(void); + // event handling: void OnSize(wxSizeEvent &event); private: + // type definitions: + WX_DECLARE_HASH_MAP(DataBrowserPropertyID,wxDataViewColumn*,wxIntegerHash,wxIntegerEqual,ColumnPointerHashMapType); + // initializing of local variables: void Init(void); @@ -541,9 +613,13 @@ private: // variables // - wxDataViewListModelNotifier* m_NotifierPtr; // the notifier is NOT owned by this class but by the associated model + bool m_Deleting; // flag indicating if a delete process is running; this flag is necessary because the notifier indicating an item deletion in the model may be called + // after the actual deletion of the item; then, the callback function "wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc" may + // try to update data into variables that are already deleted; this flag will ignore all variable update requests during item deletion void* m_cgContext; // pointer to core graphics context + + ColumnPointerHashMapType m_ColumnPointers; // all column pointers are stored in a hash map with the property ID as a key // wxWidget internal stuff: DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)