Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of missing overrides to dataview.h

Browse Source
This commit is contained in:
Hartwig
2015-11-22 09:42:01 +01:00
parent aa13cb8491
commit 612972a50c
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
include/wx/osx/dataview.h
View File

@@ -155,39 +155,39 @@ public:
}
// inherited methods from wxDataViewCtrlBase:
virtual bool AssociateModel(wxDataViewModel* model);
virtual bool AssociateModel(wxDataViewModel* model) wxOVERRIDE;
virtual bool AppendColumn (wxDataViewColumn* columnPtr);
virtual bool ClearColumns ();
virtual bool DeleteColumn (wxDataViewColumn* columnPtr);
virtual wxDataViewColumn* GetColumn (unsigned int pos) const;
virtual unsigned int GetColumnCount () const;
virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const;
virtual wxDataViewColumn* GetSortingColumn () const;
virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col);
virtual bool PrependColumn (wxDataViewColumn* columnPtr);
virtual bool AppendColumn (wxDataViewColumn* columnPtr) wxOVERRIDE;
virtual bool ClearColumns () wxOVERRIDE;
virtual bool DeleteColumn (wxDataViewColumn* columnPtr) wxOVERRIDE;
virtual wxDataViewColumn* GetColumn (unsigned int pos) const wxOVERRIDE;
virtual unsigned int GetColumnCount () const wxOVERRIDE;
virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const wxOVERRIDE;
virtual wxDataViewColumn* GetSortingColumn () const wxOVERRIDE;
virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col) wxOVERRIDE;
virtual bool PrependColumn (wxDataViewColumn* columnPtr) wxOVERRIDE;
virtual void Collapse( const wxDataViewItem& item);
virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL);
virtual void Expand(const wxDataViewItem& item);
virtual bool IsExpanded(const wxDataViewItem & item) const;
virtual void Collapse( const wxDataViewItem& item) wxOVERRIDE;
virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL) wxOVERRIDE;
virtual void Expand(const wxDataViewItem& item) wxOVERRIDE;
virtual bool IsExpanded(const wxDataViewItem & item) const wxOVERRIDE;
virtual unsigned int GetCount() const;
virtual wxRect GetItemRect(const wxDataViewItem& item,
const wxDataViewColumn* columnPtr = NULL) const;
virtual int GetSelectedItemsCount() const;
virtual int GetSelections(wxDataViewItemArray& sel) const;
const wxDataViewColumn* columnPtr = NULL) const wxOVERRIDE;
virtual int GetSelectedItemsCount() const wxOVERRIDE;
virtual int GetSelections(wxDataViewItemArray& sel) const wxOVERRIDE;
virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const;
virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const wxOVERRIDE;
virtual bool IsSelected(const wxDataViewItem& item) const;
virtual bool IsSelected(const wxDataViewItem& item) const wxOVERRIDE;
virtual void SelectAll();
virtual void Select(const wxDataViewItem& item);
virtual void SetSelections(const wxDataViewItemArray& sel);
virtual void SelectAll() wxOVERRIDE;
virtual void Select(const wxDataViewItem& item) wxOVERRIDE;
virtual void SetSelections(const wxDataViewItemArray& sel) wxOVERRIDE;
virtual void Unselect(const wxDataViewItem& item);
virtual void UnselectAll();
virtual void Unselect(const wxDataViewItem& item) wxOVERRIDE;
virtual void UnselectAll() wxOVERRIDE;
//
// implementation
@@ -201,7 +201,7 @@ public:
// finishes editing of custom items; if no custom item is currently edited the method does nothing
void FinishCustomItemEditing();
virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column);
virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE;
// returns the n-th pointer to a column;
// this method is different from GetColumn(unsigned int pos) because here 'n' is not a position in the control but the n-th
@@ -256,9 +256,9 @@ public:
m_Deleting = deleting;
}
virtual wxDataViewColumn *GetCurrentColumn() const;
virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE;
virtual wxVisualAttributes GetDefaultAttributes() const
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{
return GetClassDefaultAttributes(GetWindowVariant());
}
@@ -268,10 +268,10 @@ public:
protected:
// inherited methods from wxDataViewCtrlBase
virtual void DoSetExpanderColumn();
virtual void DoSetIndent();
virtual void DoSetExpanderColumn() wxOVERRIDE;
virtual void DoSetIndent() wxOVERRIDE;
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
// event handling
void OnSize(wxSizeEvent &event);
@@ -281,8 +281,8 @@ private:
// initializing of local variables:
void Init();
virtual wxDataViewItem DoGetCurrentItem() const;
virtual void DoSetCurrentItem(const wxDataViewItem& item);
virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE;
virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE;
//
// variables