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

use wxOVERRIDE in wxMSW sources

Browse Source
This commit is contained in:
Paul Cornett
2016-09-23 07:59:11 -07:00
parent 9b477e46e5
commit 9b19a6e529
121 changed files with 1454 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/wx/msw/spinctrl.h
View File

@@ -71,22 +71,22 @@ public:
virtual ~wxSpinCtrl();
virtual void SetValue(int val);
virtual int GetValue() const;
virtual void SetRange(int minVal, int maxVal);
virtual bool SetFont(const wxFont &font);
virtual void SetFocus();
virtual void SetValue(int val) wxOVERRIDE;
virtual int GetValue() const wxOVERRIDE;
virtual void SetRange(int minVal, int maxVal) wxOVERRIDE;
virtual bool SetFont(const wxFont &font) wxOVERRIDE;
virtual void SetFocus() wxOVERRIDE;
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 Reparent(wxWindowBase *newParent);
virtual bool Reparent(wxWindowBase *newParent) wxOVERRIDE;
// wxSpinButton doesn't accept focus, but we do
virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
virtual bool AcceptsFocus() const wxOVERRIDE { return wxWindow::AcceptsFocus(); }
// we're like wxTextCtrl and not (default) wxButton
virtual wxVisualAttributes GetDefaultAttributes() const
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{
return GetClassDefaultAttributes(GetWindowVariant());
}
@@ -109,24 +109,24 @@ public:
bool ProcessTextCommand(WXWORD cmd, WXWORD id);
// recognize buddy window as part of this control at wx level
virtual bool ContainsHWND(WXHWND hWnd) const { return hWnd == m_hwndBuddy; }
virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE { return hWnd == m_hwndBuddy; }
virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
protected:
virtual void DoGetPosition(int *x, int *y) const;
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
virtual void DoGetSize(int *width, int *height) const;
virtual void DoGetClientSize(int *x, int *y) const;
virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE;
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
virtual void DoGetClientSize(int *x, int *y) const wxOVERRIDE;
#if wxUSE_TOOLTIPS
virtual void DoSetToolTip( wxToolTip *tip );
virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE;
#endif // wxUSE_TOOLTIPS
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control);
WXWORD pos, WXHWND control) wxOVERRIDE;
// handle processing of special keys
void OnChar(wxKeyEvent& event);
@@ -137,7 +137,7 @@ protected:
void SendSpinUpdate(int value);
// called to ensure that the value is in the correct range
virtual void NormalizeValue();
virtual void NormalizeValue() wxOVERRIDE;
// the value of the control before the latest change (which might not have
// changed anything in fact -- this is why we need this field)