Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
parent
be5095acdd
commit
88d526660f
1282 changed files with 11878 additions and 11878 deletions
|
|
@ -93,46 +93,46 @@ public:
|
|||
|
||||
wxAuiDefaultDockArt();
|
||||
|
||||
wxAuiDockArt* Clone() wxOVERRIDE;
|
||||
int GetMetric(int metricId) wxOVERRIDE;
|
||||
void SetMetric(int metricId, int newVal) wxOVERRIDE;
|
||||
wxColour GetColour(int id) wxOVERRIDE;
|
||||
void SetColour(int id, const wxColor& colour) wxOVERRIDE;
|
||||
void SetFont(int id, const wxFont& font) wxOVERRIDE;
|
||||
wxFont GetFont(int id) wxOVERRIDE;
|
||||
wxAuiDockArt* Clone() override;
|
||||
int GetMetric(int metricId) override;
|
||||
void SetMetric(int metricId, int newVal) override;
|
||||
wxColour GetColour(int id) override;
|
||||
void SetColour(int id, const wxColor& colour) override;
|
||||
void SetFont(int id, const wxFont& font) override;
|
||||
wxFont GetFont(int id) override;
|
||||
|
||||
void DrawSash(wxDC& dc,
|
||||
wxWindow *window,
|
||||
int orientation,
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
const wxRect& rect) override;
|
||||
|
||||
void DrawBackground(wxDC& dc,
|
||||
wxWindow *window,
|
||||
int orientation,
|
||||
const wxRect& rect) wxOVERRIDE;
|
||||
const wxRect& rect) override;
|
||||
|
||||
void DrawCaption(wxDC& dc,
|
||||
wxWindow *window,
|
||||
const wxString& text,
|
||||
const wxRect& rect,
|
||||
wxAuiPaneInfo& pane) wxOVERRIDE;
|
||||
wxAuiPaneInfo& pane) override;
|
||||
|
||||
void DrawGripper(wxDC& dc,
|
||||
wxWindow *window,
|
||||
const wxRect& rect,
|
||||
wxAuiPaneInfo& pane) wxOVERRIDE;
|
||||
wxAuiPaneInfo& pane) override;
|
||||
|
||||
void DrawBorder(wxDC& dc,
|
||||
wxWindow *window,
|
||||
const wxRect& rect,
|
||||
wxAuiPaneInfo& pane) wxOVERRIDE;
|
||||
wxAuiPaneInfo& pane) override;
|
||||
|
||||
void DrawPaneButton(wxDC& dc,
|
||||
wxWindow *window,
|
||||
int button,
|
||||
int buttonState,
|
||||
const wxRect& rect,
|
||||
wxAuiPaneInfo& pane) wxOVERRIDE;
|
||||
wxAuiPaneInfo& pane) override;
|
||||
|
||||
#if WXWIN_COMPATIBILITY_3_0
|
||||
wxDEPRECATED_MSG("This is not intended for the public API")
|
||||
|
|
@ -141,7 +141,7 @@ public:
|
|||
wxAuiPaneInfo& pane);
|
||||
#endif
|
||||
|
||||
virtual void UpdateColoursFromSystem() wxOVERRIDE;
|
||||
virtual void UpdateColoursFromSystem() override;
|
||||
|
||||
|
||||
protected:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue