From 5f7c4fa859bbf5b3c7df44d2ea2f82dc5d11bfec Mon Sep 17 00:00:00 2001 From: Hartwig Date: Sun, 22 Nov 2015 10:14:29 +0100 Subject: [PATCH] Addition of overrids in scrolbar.h, slider.h and vscroll.h --- include/wx/osx/scrolbar.h | 20 +++++++-------- include/wx/osx/slider.h | 54 +++++++++++++++++++-------------------- include/wx/vscroll.h | 6 ++--- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/include/wx/osx/scrolbar.h b/include/wx/osx/scrolbar.h index 296c4b5b8b..fdfc105d97 100644 --- a/include/wx/osx/scrolbar.h +++ b/include/wx/osx/scrolbar.h @@ -36,14 +36,14 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr); - virtual int GetThumbPosition() const ; - virtual int GetThumbSize() const { return m_viewSize; } - virtual int GetPageSize() const { return m_pageSize; } - virtual int GetRange() const { return m_objectSize; } + virtual int GetThumbPosition() const wxOVERRIDE; + virtual int GetThumbSize() const wxOVERRIDE { return m_viewSize; } + virtual int GetPageSize() const wxOVERRIDE { return m_pageSize; } + virtual int GetRange() const wxOVERRIDE { return m_objectSize; } - virtual void SetThumbPosition(int viewStart); + virtual void SetThumbPosition(int viewStart) wxOVERRIDE; virtual void SetScrollbar(int position, int thumbSize, int range, - int pageSize, bool refresh = true); + int pageSize, bool refresh = true) wxOVERRIDE; // needed for RTTI void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; } @@ -51,11 +51,11 @@ public: void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; } // implementation only from now on - void Command(wxCommandEvent& event); - virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; - virtual bool OSXHandleClicked( double timestampsec ); + void Command(wxCommandEvent& event) wxOVERRIDE; + virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; + virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; int m_pageSize; int m_viewSize; diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h index e0ce8eb438..fffde4d3ee 100644 --- a/include/wx/osx/slider.h +++ b/include/wx/osx/slider.h @@ -43,53 +43,53 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxSliderNameStr); - virtual int GetValue() const ; - virtual void SetValue(int); + virtual int GetValue() const wxOVERRIDE; + virtual void SetValue(int) wxOVERRIDE; - void SetRange(int minValue, int maxValue); + void SetRange(int minValue, int maxValue) wxOVERRIDE; - int GetMin() const { return m_rangeMin; } - int GetMax() const { return m_rangeMax; } + int GetMin() const wxOVERRIDE { return m_rangeMin; } + int GetMax() const wxOVERRIDE { return m_rangeMax; } void SetMin(int minValue) { SetRange(minValue, m_rangeMax); } void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); } // For trackbars only - int GetTickFreq() const { return m_tickFreq; } - void SetPageSize(int pageSize); - int GetPageSize() const ; - void ClearSel() ; - void ClearTicks() ; - void SetLineSize(int lineSize); - int GetLineSize() const ; - int GetSelEnd() const ; - int GetSelStart() const ; - void SetSelection(int minPos, int maxPos); - void SetThumbLength(int len) ; - int GetThumbLength() const ; - void SetTick(int tickPos) ; + int GetTickFreq() const wxOVERRIDE { return m_tickFreq; } + void SetPageSize(int pageSize) wxOVERRIDE; + int GetPageSize() const wxOVERRIDE; + void ClearSel() wxOVERRIDE; + void ClearTicks() wxOVERRIDE; + void SetLineSize(int lineSize) wxOVERRIDE; + int GetLineSize() const wxOVERRIDE; + int GetSelEnd() const wxOVERRIDE; + int GetSelStart() const wxOVERRIDE; + void SetSelection(int minPos, int maxPos) wxOVERRIDE; + void SetThumbLength(int len) wxOVERRIDE; + int GetThumbLength() const wxOVERRIDE; + void SetTick(int tickPos) wxOVERRIDE; - void Command(wxCommandEvent& event); + void Command(wxCommandEvent& event) wxOVERRIDE; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ); - virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; + virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; + virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; protected: // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq); + virtual void DoSetTickFreq(int freq) wxOVERRIDE; - virtual wxSize DoGetBestSize() const; - virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags); - virtual void DoMoveWindow(int x, int y, int w, int h); + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags) wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int w, int h) wxOVERRIDE; // set min/max size of the slider virtual void DoSetSizeHints( int minW, int minH, int maxW, int maxH, - int incW, int incH); + int incW, int incH) wxOVERRIDE; // Common processing to invert slider values based on wxSL_INVERSE - virtual int ValueInvertOrNot(int value) const; + virtual int ValueInvertOrNot(int value) const wxOVERRIDE; wxStaticText* m_macMinimumStatic ; wxStaticText* m_macMaximumStatic ; diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h index d8a7d921e0..550d2cd471 100644 --- a/include/wx/vscroll.h +++ b/include/wx/vscroll.h @@ -727,7 +727,7 @@ public: #ifdef __WXMAC__ protected: - virtual void UpdateMacScrollWindow() { Update(); } + virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } #endif // __WXMAC__ private: @@ -794,7 +794,7 @@ public: #ifdef __WXMAC__ protected: - virtual void UpdateMacScrollWindow() { Update(); } + virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } #endif // __WXMAC__ private: @@ -859,7 +859,7 @@ public: #ifdef __WXMAC__ protected: - virtual void UpdateMacScrollWindow() { Update(); } + virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } #endif // __WXMAC__ private: