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

Addition of missing overrides in toplevel.h

Browse Source
This commit is contained in:
Hartwig
2015-11-22 09:44:01 +01:00
parent 612972a50c
commit 1eb241e97b
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/wx/osx/toplevel.h
View File

@@ -46,33 +46,33 @@ public:
bool Create(wxWindow *parent, WXWindow nativeWindow); 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 // Attracts the users attention to this window if the application is
// inactive (should be called when a background event occurs) // 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 // implement base class pure virtuals
virtual void Maximize(bool maximize = true); virtual void Maximize(bool maximize = true) wxOVERRIDE;
virtual bool IsMaximized() const; virtual bool IsMaximized() const wxOVERRIDE;
virtual void Iconize(bool iconize = true); virtual void Iconize(bool iconize = true) wxOVERRIDE;
virtual bool IsIconized() const; virtual bool IsIconized() const wxOVERRIDE;
virtual void Restore(); virtual void Restore() wxOVERRIDE;
virtual bool IsActive(); virtual bool IsActive() wxOVERRIDE;
virtual void ShowWithoutActivating(); virtual void ShowWithoutActivating() wxOVERRIDE;
bool EnableFullScreenView(bool enable = true) wxOVERRIDE; bool EnableFullScreenView(bool enable = true) wxOVERRIDE;
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ; virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
virtual bool IsFullScreen() const ; virtual bool IsFullScreen() const wxOVERRIDE;
// implementation from now on // implementation from now on
// -------------------------- // --------------------------
virtual void SetTitle( const wxString& title); virtual void SetTitle( const wxString& title) wxOVERRIDE;
virtual wxString GetTitle() const; virtual wxString GetTitle() const wxOVERRIDE;
// EnableCloseButton(false) used to disable the "Close" // EnableCloseButton(false) used to disable the "Close"
// button on the title bar // button on the title bar
@@ -80,13 +80,13 @@ public:
virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE; virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE;
virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE; virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE;
virtual void SetLabel(const wxString& label) { SetTitle( label ); } virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); }
virtual wxString GetLabel() const { return GetTitle(); } virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); }
virtual void OSXSetModified(bool modified); virtual void OSXSetModified(bool modified) wxOVERRIDE;
virtual bool OSXIsModified() const; 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! // do *not* call this to iconize the frame, this is a private function!
void OSXSetIconizeState(bool iconic); void OSXSetIconizeState(bool iconic);