diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h index 334e2ffdb4..3039639a54 100644 --- a/include/wx/osx/checklst.h +++ b/include/wx/osx/checklst.h @@ -64,19 +64,19 @@ public: const wxString& name = wxListBoxNameStr); // items may be checked - bool IsChecked(unsigned int uiIndex) const; - void Check(unsigned int uiIndex, bool bCheck = true); + bool IsChecked(unsigned int uiIndex) const wxOVERRIDE; + void Check(unsigned int uiIndex, bool bCheck = true) wxOVERRIDE; // data callbacks - virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); - virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); + virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE; + virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE; protected: // override all methods which add/delete items to update m_checks array as // well - virtual void OnItemInserted(unsigned int pos); - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); + virtual void OnItemInserted(unsigned int pos) wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() wxOVERRIDE; // the array containing the checked status of the items wxArrayInt m_checks; diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h index c717ee0521..cbcee7b539 100644 --- a/include/wx/osx/listbox.h +++ b/include/wx/osx/listbox.h @@ -91,24 +91,24 @@ public: virtual ~wxListBox(); // implement base class pure virtuals - virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL); + virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL) wxOVERRIDE; - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; + virtual unsigned int GetCount() const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; // data callbacks virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); - virtual bool IsSelected(int n) const; - virtual int GetSelection() const; - virtual int GetSelections(wxArrayInt& aSelections) const; + virtual bool IsSelected(int n) const wxOVERRIDE; + virtual int GetSelection() const wxOVERRIDE; + virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; - virtual void EnsureVisible(int n); + virtual void EnsureVisible(int n) wxOVERRIDE; - virtual wxVisualAttributes GetDefaultAttributes() const + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -127,27 +127,27 @@ protected: // at a certain line - which cannot be predetermined for sorted list data virtual void OnItemInserted(unsigned int pos); - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; // from wxItemContainer virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type); + void **clientData, wxClientDataType type) wxOVERRIDE; - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; + virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; + virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; // from wxListBoxBase - virtual void DoSetSelection(int n, bool select); - virtual void DoSetFirstItem(int n); - virtual int DoListHitTest(const wxPoint& point) const; + virtual void DoSetSelection(int n, bool select) wxOVERRIDE; + virtual void DoSetFirstItem(int n) wxOVERRIDE; + virtual int DoListHitTest(const wxPoint& point) const wxOVERRIDE; // free memory (common part of Clear() and dtor) // prevent collision with some BSD definitions of macro Free() void FreeData(); - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; bool m_blockEvents;