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

Addition of overrides in anybutton.h, collpaneg.h, notebook.h, spinctlg.h, srchctrl.h and radiobox.h

Browse Source
This commit is contained in:
Hartwig
2015-11-22 10:15:41 +01:00
parent 5e39dd361f
commit 308de8b69d
6 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/generic/collpaneg.h
View File

@@ -53,16 +53,16 @@ public:
const wxString& name = wxCollapsiblePaneNameStr);
// public wxCollapsiblePane API
virtual void Collapse(bool collapse = true);
virtual void SetLabel(const wxString &label);
virtual void Collapse(bool collapse = true) wxOVERRIDE;
virtual void SetLabel(const wxString &label) wxOVERRIDE;
virtual bool IsCollapsed() const
virtual bool IsCollapsed() const wxOVERRIDE
{ return m_pPane==NULL || !m_pPane->IsShown(); }
virtual wxWindow *GetPane() const
virtual wxWindow *GetPane() const wxOVERRIDE
{ return m_pPane; }
virtual wxString GetLabel() const;
virtual wxString GetLabel() const wxOVERRIDE;
virtual bool Layout();
virtual bool Layout() wxOVERRIDE;
// for the generic collapsible pane only:
@@ -74,7 +74,7 @@ public:
protected:
// overridden methods
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
int GetBorder() const;