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

use more wxOVERRIDE (#329)

Browse Source
This commit is contained in:
Maarten
2016-09-25 22:21:28 +02:00
committed by paulcor
parent d0c57dbef0
commit 977a826639
66 changed files with 456 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/wx/renderer.h
View File

@@ -418,7 +418,7 @@ public:
const wxRect& rect,
int flags = 0,
wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL)
wxHeaderButtonParams* params = NULL) wxOVERRIDE
{ return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); }
virtual int DrawHeaderButtonContents(wxWindow *win,
@@ -426,25 +426,25 @@ public:
const wxRect& rect,
int flags = 0,
wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL)
wxHeaderButtonParams* params = NULL) wxOVERRIDE
{ return m_rendererNative.DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); }
virtual int GetHeaderButtonHeight(wxWindow *win)
virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE
{ return m_rendererNative.GetHeaderButtonHeight(win); }
virtual int GetHeaderButtonMargin(wxWindow *win)
virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE
{ return m_rendererNative.GetHeaderButtonMargin(win); }
virtual void DrawTreeItemButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawTreeItemButton(win, dc, rect, flags); }
virtual void DrawSplitterBorder(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawSplitterBorder(win, dc, rect, flags); }
virtual void DrawSplitterSash(wxWindow *win,
@@ -452,80 +452,80 @@ public:
const wxSize& size,
wxCoord position,
wxOrientation orient,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawSplitterSash(win, dc, size,
position, orient, flags); }
virtual void DrawComboBoxDropButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawComboBoxDropButton(win, dc, rect, flags); }
virtual void DrawDropArrow(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawDropArrow(win, dc, rect, flags); }
virtual void DrawCheckBox(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawCheckBox( win, dc, rect, flags ); }
virtual wxSize GetCheckBoxSize(wxWindow *win)
virtual wxSize GetCheckBoxSize(wxWindow *win) wxOVERRIDE
{ return m_rendererNative.GetCheckBoxSize(win); }
virtual void DrawPushButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawPushButton( win, dc, rect, flags ); }
virtual void DrawCollapseButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawCollapseButton(win, dc, rect, flags); }
virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc)
virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE
{ return m_rendererNative.GetCollapseButtonSize(win, dc); }
virtual void DrawItemSelectionRect(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); }
virtual void DrawFocusRect(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawFocusRect( win, dc, rect, flags ); }
virtual void DrawChoice(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawChoice( win, dc, rect, flags); }
virtual void DrawComboBox(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawComboBox( win, dc, rect, flags); }
virtual void DrawTextCtrl(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawTextCtrl( win, dc, rect, flags); }
virtual void DrawRadioBitmap(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); }
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
@@ -533,7 +533,7 @@ public:
wxDC& dc,
const wxRect& rect,
wxTitleBarButton button,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); }
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
@@ -542,7 +542,7 @@ public:
const wxRect& rect,
int value,
int max,
int flags = 0)
int flags = 0) wxOVERRIDE
{ m_rendererNative.DrawGauge(win, dc, rect, value, max, flags); }
virtual void DrawItemText(wxWindow* win,
@@ -551,13 +551,13 @@ public:
const wxRect& rect,
int align = wxALIGN_LEFT | wxALIGN_TOP,
int flags = 0,
wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END)
wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) wxOVERRIDE
{ m_rendererNative.DrawItemText(win, dc, text, rect, align, flags, ellipsizeMode); }
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE
{ return m_rendererNative.GetSplitterParams(win); }
virtual wxRendererVersion GetVersion() const
virtual wxRendererVersion GetVersion() const wxOVERRIDE
{ return m_rendererNative.GetVersion(); }
protected: