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

Use wxOVERRIDE in wx/osx/cocoa/dataview.h

Browse Source 
No real changes, just add wxOVERRIDE.
This commit is contained in:
Vadim Zeitlin
2021-04-24 00:38:29 +02:00
parent 2973d75f25
commit 16ba1daebf
1 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
include/wx/osx/cocoa/dataview.h
View File

@@ -495,74 +495,74 @@ public:
} }
// column related methods (inherited from wxDataViewWidgetImpl) // column related methods (inherited from wxDataViewWidgetImpl)
virtual bool ClearColumns(); virtual bool ClearColumns() wxOVERRIDE;
virtual bool DeleteColumn(wxDataViewColumn* columnPtr); virtual bool DeleteColumn(wxDataViewColumn* columnPtr) wxOVERRIDE;
virtual void DoSetExpanderColumn(wxDataViewColumn const* columnPtr); virtual void DoSetExpanderColumn(wxDataViewColumn const* columnPtr) wxOVERRIDE;
virtual wxDataViewColumn* GetColumn(unsigned int pos) const; virtual wxDataViewColumn* GetColumn(unsigned int pos) const wxOVERRIDE;
virtual int GetColumnPosition(wxDataViewColumn const* columnPtr) const; virtual int GetColumnPosition(wxDataViewColumn const* columnPtr) const wxOVERRIDE;
virtual bool InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr); virtual bool InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr) wxOVERRIDE;
virtual void FitColumnWidthToContent(unsigned int pos); virtual void FitColumnWidthToContent(unsigned int pos) wxOVERRIDE;
// item related methods (inherited from wxDataViewWidgetImpl) // item related methods (inherited from wxDataViewWidgetImpl)
virtual bool Add(const wxDataViewItem& parent, const wxDataViewItem& item); virtual bool Add(const wxDataViewItem& parent, const wxDataViewItem& item) wxOVERRIDE;
virtual bool Add(const wxDataViewItem& parent, virtual bool Add(const wxDataViewItem& parent,
const wxDataViewItemArray& items); const wxDataViewItemArray& items) wxOVERRIDE;
virtual void Collapse(const wxDataViewItem& item); virtual void Collapse(const wxDataViewItem& item) wxOVERRIDE;
virtual void EnsureVisible(const wxDataViewItem& item, virtual void EnsureVisible(const wxDataViewItem& item,
wxDataViewColumn const* columnPtr); wxDataViewColumn const* columnPtr) wxOVERRIDE;
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const wxOVERRIDE;
virtual int GetCountPerPage() const; virtual int GetCountPerPage() const wxOVERRIDE;
virtual wxRect GetRectangle(const wxDataViewItem& item, virtual wxRect GetRectangle(const wxDataViewItem& item,
wxDataViewColumn const* columnPtr); wxDataViewColumn const* columnPtr) wxOVERRIDE;
virtual wxDataViewItem GetTopItem() const; virtual wxDataViewItem GetTopItem() const wxOVERRIDE;
virtual bool IsExpanded(const wxDataViewItem& item) const; virtual bool IsExpanded(const wxDataViewItem& item) const wxOVERRIDE;
virtual bool Reload(); virtual bool Reload() wxOVERRIDE;
virtual bool Remove(const wxDataViewItem& parent); virtual bool Remove(const wxDataViewItem& parent) wxOVERRIDE;
virtual bool Update(const wxDataViewColumn* columnPtr); virtual bool Update(const wxDataViewColumn* columnPtr) wxOVERRIDE;
virtual bool Update(const wxDataViewItem& parent, virtual bool Update(const wxDataViewItem& parent,
const wxDataViewItem& item); const wxDataViewItem& item) wxOVERRIDE;
virtual bool Update(const wxDataViewItem& parent, virtual bool Update(const wxDataViewItem& parent,
const wxDataViewItemArray& items); const wxDataViewItemArray& items) wxOVERRIDE;
// model related methods // model related methods
virtual bool AssociateModel(wxDataViewModel* model); virtual bool AssociateModel(wxDataViewModel* model) wxOVERRIDE;
// //
// selection related methods (inherited from wxDataViewWidgetImpl) // selection related methods (inherited from wxDataViewWidgetImpl)
// //
virtual wxDataViewItem GetCurrentItem() const; virtual wxDataViewItem GetCurrentItem() const wxOVERRIDE;
virtual void SetCurrentItem(const wxDataViewItem& item); virtual void SetCurrentItem(const wxDataViewItem& item) wxOVERRIDE;
virtual wxDataViewColumn *GetCurrentColumn() const; virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE;
virtual int GetSelectedItemsCount() const; virtual int GetSelectedItemsCount() const wxOVERRIDE;
virtual int GetSelections(wxDataViewItemArray& sel) const; virtual int GetSelections(wxDataViewItemArray& sel) const wxOVERRIDE;
virtual bool IsSelected(const wxDataViewItem& item) const; virtual bool IsSelected(const wxDataViewItem& item) const wxOVERRIDE;
virtual void Select(const wxDataViewItem& item); virtual void Select(const wxDataViewItem& item) wxOVERRIDE;
virtual void Select(const wxDataViewItemArray& items); virtual void Select(const wxDataViewItemArray& items) wxOVERRIDE;
virtual void SelectAll(); virtual void SelectAll() wxOVERRIDE;
virtual void Unselect(const wxDataViewItem& item); virtual void Unselect(const wxDataViewItem& item) wxOVERRIDE;
virtual void UnselectAll(); virtual void UnselectAll() wxOVERRIDE;
// //
// sorting related methods // sorting related methods
// //
virtual wxDataViewColumn* GetSortingColumn () const; virtual wxDataViewColumn* GetSortingColumn () const wxOVERRIDE;
virtual void Resort(); virtual void Resort() wxOVERRIDE;
// //
// other methods (inherited from wxDataViewWidgetImpl) // other methods (inherited from wxDataViewWidgetImpl)
// //
virtual void DoSetIndent(int indent); virtual void DoSetIndent(int indent) wxOVERRIDE;
virtual void DoExpand(const wxDataViewItem& item, bool expandChildren); virtual void DoExpand(const wxDataViewItem& item, bool expandChildren) wxOVERRIDE;
virtual void HitTest(const wxPoint& point, virtual void HitTest(const wxPoint& point,
wxDataViewItem& item, wxDataViewItem& item,
wxDataViewColumn*& columnPtr) const; wxDataViewColumn*& columnPtr) const wxOVERRIDE;
virtual void SetRowHeight(int height); virtual void SetRowHeight(int height) wxOVERRIDE;
virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height); virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height) wxOVERRIDE;
virtual void OnSize(); virtual void OnSize() wxOVERRIDE;
virtual void StartEditor( const wxDataViewItem & item, unsigned int column ); virtual void StartEditor( const wxDataViewItem & item, unsigned int column ) wxOVERRIDE;
// drag & drop helper methods // drag & drop helper methods
wxDataFormat GetDnDDataFormat(wxDataObjectComposite* dataObjects); wxDataFormat GetDnDDataFormat(wxDataObjectComposite* dataObjects);
@@ -571,7 +571,7 @@ public:
// Cocoa-specific helpers // Cocoa-specific helpers
id GetItemAtRow(int row) const; id GetItemAtRow(int row) const;
virtual void SetFont(const wxFont& font); virtual void SetFont(const wxFont& font) wxOVERRIDE;
private: private:
void InitOutlineView(long style); void InitOutlineView(long style);