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

Addition of overrids in scrolbar.h, slider.h and vscroll.h

Browse Source
This commit is contained in:
Hartwig
2015-11-22 10:14:29 +01:00
parent 6802052efb
commit 5f7c4fa859
3 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/osx/scrolbar.h
View File

@@ -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;