From 1eb241e97b5adaaef02be079762c6655c7776ef7 Mon Sep 17 00:00:00 2001 From: Hartwig Date: Sun, 22 Nov 2015 09:44:01 +0100 Subject: [PATCH] Addition of missing overrides in toplevel.h --- include/wx/osx/toplevel.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h index e82711a861..72f58c98a6 100644 --- a/include/wx/osx/toplevel.h +++ b/include/wx/osx/toplevel.h @@ -46,33 +46,33 @@ public: bool Create(wxWindow *parent, WXWindow nativeWindow); - virtual bool Destroy(); + virtual bool Destroy() wxOVERRIDE; - virtual wxPoint GetClientAreaOrigin() const; + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; // Attracts the users attention to this window if the application is // inactive (should be called when a background event occurs) - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); + virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE; // implement base class pure virtuals - virtual void Maximize(bool maximize = true); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = true); - virtual bool IsIconized() const; - virtual void Restore(); + virtual void Maximize(bool maximize = true) wxOVERRIDE; + virtual bool IsMaximized() const wxOVERRIDE; + virtual void Iconize(bool iconize = true) wxOVERRIDE; + virtual bool IsIconized() const wxOVERRIDE; + virtual void Restore() wxOVERRIDE; - virtual bool IsActive(); + virtual bool IsActive() wxOVERRIDE; - virtual void ShowWithoutActivating(); + virtual void ShowWithoutActivating() wxOVERRIDE; bool EnableFullScreenView(bool enable = true) wxOVERRIDE; - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ; - virtual bool IsFullScreen() const ; + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; + virtual bool IsFullScreen() const wxOVERRIDE; // implementation from now on // -------------------------- - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; + virtual void SetTitle( const wxString& title) wxOVERRIDE; + virtual wxString GetTitle() const wxOVERRIDE; // EnableCloseButton(false) used to disable the "Close" // button on the title bar @@ -80,13 +80,13 @@ public: virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE; virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE; - virtual void SetLabel(const wxString& label) { SetTitle( label ); } - virtual wxString GetLabel() const { return GetTitle(); } + virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); } + virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); } - virtual void OSXSetModified(bool modified); - virtual bool OSXIsModified() const; + virtual void OSXSetModified(bool modified) wxOVERRIDE; + virtual bool OSXIsModified() const wxOVERRIDE; - virtual void SetRepresentedFilename(const wxString& filename); + virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE; // do *not* call this to iconize the frame, this is a private function! void OSXSetIconizeState(bool iconic);