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;

26
include/wx/generic/spinctlg.h
View File

@@ -64,27 +64,27 @@ public:
// T GetMin() const
// T GetMax() const
// T GetIncrement() const
virtual bool GetSnapToTicks() const { return m_snap_to_ticks; }
virtual bool GetSnapToTicks() const wxOVERRIDE { return m_snap_to_ticks; }
// unsigned GetDigits() const - wxSpinCtrlDouble only
// operations
virtual void SetValue(const wxString& text);
virtual void SetValue(const wxString& text) wxOVERRIDE;
// void SetValue(T val)
// void SetRange(T minVal, T maxVal)
// void SetIncrement(T inc)
virtual void SetSnapToTicks(bool snap_to_ticks);
virtual void SetSnapToTicks(bool snap_to_ticks) wxOVERRIDE;
// void SetDigits(unsigned digits) - wxSpinCtrlDouble only
// Select text in the textctrl
void SetSelection(long from, long to);
void SetSelection(long from, long to) wxOVERRIDE;
// implementation from now on
// forward these functions to all subcontrols
virtual bool Enable(bool enable = true);
virtual bool Show(bool show = true);
virtual bool Enable(bool enable = true) wxOVERRIDE;
virtual bool Show(bool show = true) wxOVERRIDE;
virtual bool SetBackgroundColour(const wxColour& colour);
virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
// get the subcontrols
wxTextCtrl *GetText() const { return m_textCtrl; }
@@ -98,16 +98,16 @@ public:
// this window itself is used only as a container for its sub windows so it
// shouldn't accept the focus at all and any attempts to explicitly set
// focus to it should give focus to its text constol part
virtual bool AcceptsFocus() const { return false; }
virtual void SetFocus();
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
virtual void SetFocus() wxOVERRIDE;
friend class wxSpinCtrlTextGeneric;
protected:
// override the base class virtuals involved into geometry calculations
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
#ifdef __WXMSW__
// and, for MSW, enabling this window itself
@@ -165,7 +165,7 @@ private:
void Init();
// Implement pure virtual function inherited from wxCompositeWindow.
virtual wxWindowList GetCompositeWindowParts() const;
virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE;
wxDECLARE_EVENT_TABLE();
};