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

Addition of missing overrides to frame.h

Browse Source
This commit is contained in:
Hartwig
2015-11-22 09:36:45 +01:00
parent 1da514f1b9
commit 2a6d18547c
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/osx/frame.h
View File

@@ -48,10 +48,10 @@ public:
// get the origin of the client area (which may be different from (0, 0) // get the origin of the client area (which may be different from (0, 0)
// if the frame has a toolbar) in client coordinates // if the frame has a toolbar) in client coordinates
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
// override some more virtuals // override some more virtuals
virtual bool Enable(bool enable = true) ; virtual bool Enable(bool enable = true) wxOVERRIDE;
// event handlers // event handlers
void OnActivate(wxActivateEvent& event); void OnActivate(wxActivateEvent& event);
@@ -61,9 +61,9 @@ public:
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar(long style = -1, virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = -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 #endif // wxUSE_TOOLBAR
// Status bar // Status bar
@@ -71,7 +71,7 @@ public:
virtual wxStatusBar* OnCreateStatusBar(int number = 1, virtual wxStatusBar* OnCreateStatusBar(int number = 1,
long style = wxSTB_DEFAULT_STYLE, long style = wxSTB_DEFAULT_STYLE,
wxWindowID id = 0, wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr); const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
// called by wxWindow whenever it gets focus // called by wxWindow whenever it gets focus
@@ -81,32 +81,32 @@ public:
void PositionBars(); void PositionBars();
// internal response to size events // internal response to size events
virtual void MacOnInternalSize() { PositionBars(); } virtual void MacOnInternalSize() wxOVERRIDE { PositionBars(); }
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
virtual void PositionToolBar(); virtual void PositionToolBar() wxOVERRIDE;
#endif #endif
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
virtual void PositionStatusBar(); virtual void PositionStatusBar() wxOVERRIDE;
#endif #endif
// override base class virtuals // override base class virtuals
virtual void DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
#if wxUSE_MENUS #if wxUSE_MENUS
virtual void DetachMenuBar(); virtual void DetachMenuBar() wxOVERRIDE;
virtual void AttachMenuBar(wxMenuBar *menubar); virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE;
#endif #endif
// the last focused child: we restore focus to it on activation // the last focused child: we restore focus to it on activation
wxWindow *m_winLastFocused; wxWindow *m_winLastFocused;
virtual bool MacIsChildOfClientArea( const wxWindow* child ) const ; virtual bool MacIsChildOfClientArea( const wxWindow* child ) const wxOVERRIDE;
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS(wxFrame); wxDECLARE_DYNAMIC_CLASS(wxFrame);