From 2a6d18547cac2bc7c368d91dd4fd3dd9d8664ac8 Mon Sep 17 00:00:00 2001 From: Hartwig Date: Sun, 22 Nov 2015 09:36:45 +0100 Subject: [PATCH] Addition of missing overrides to frame.h --- include/wx/osx/frame.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h index 5727144eeb..14bab22241 100644 --- a/include/wx/osx/frame.h +++ b/include/wx/osx/frame.h @@ -48,10 +48,10 @@ public: // get the origin of the client area (which may be different from (0, 0) // if the frame has a toolbar) in client coordinates - virtual wxPoint GetClientAreaOrigin() const; + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; // override some more virtuals - virtual bool Enable(bool enable = true) ; + virtual bool Enable(bool enable = true) wxOVERRIDE; // event handlers void OnActivate(wxActivateEvent& event); @@ -61,9 +61,9 @@ public: #if wxUSE_TOOLBAR virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = -1, - const wxString& name = wxToolBarNameStr); + const wxString& name = wxToolBarNameStr) wxOVERRIDE; - virtual void SetToolBar(wxToolBar *toolbar); + virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE; #endif // wxUSE_TOOLBAR // Status bar @@ -71,7 +71,7 @@ public: virtual wxStatusBar* OnCreateStatusBar(int number = 1, long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr); + const wxString& name = wxStatusLineNameStr) wxOVERRIDE; #endif // wxUSE_STATUSBAR // called by wxWindow whenever it gets focus @@ -81,32 +81,32 @@ public: void PositionBars(); // internal response to size events - virtual void MacOnInternalSize() { PositionBars(); } + virtual void MacOnInternalSize() wxOVERRIDE { PositionBars(); } protected: // common part of all ctors void Init(); #if wxUSE_TOOLBAR - virtual void PositionToolBar(); + virtual void PositionToolBar() wxOVERRIDE; #endif #if wxUSE_STATUSBAR - virtual void PositionStatusBar(); + virtual void PositionStatusBar() wxOVERRIDE; #endif // override base class virtuals - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetClientSize(int width, int height); + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoSetClientSize(int width, int height) wxOVERRIDE; #if wxUSE_MENUS - virtual void DetachMenuBar(); - virtual void AttachMenuBar(wxMenuBar *menubar); + virtual void DetachMenuBar() wxOVERRIDE; + virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; #endif // the last focused child: we restore focus to it on activation wxWindow *m_winLastFocused; - virtual bool MacIsChildOfClientArea( const wxWindow* child ) const ; + virtual bool MacIsChildOfClientArea( const wxWindow* child ) const wxOVERRIDE; wxDECLARE_EVENT_TABLE(); wxDECLARE_DYNAMIC_CLASS(wxFrame);