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

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/gtk/frame.h
View File

@@ -42,15 +42,15 @@ public:
virtual ~wxFrame();
#if wxUSE_STATUSBAR
void SetStatusBar(wxStatusBar *statbar);
void SetStatusBar(wxStatusBar *statbar) wxOVERRIDE;
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
void SetToolBar(wxToolBar *toolbar);
void SetToolBar(wxToolBar *toolbar) wxOVERRIDE;
#endif // wxUSE_TOOLBAR
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
wxPoint GetClientAreaOrigin() const wxOVERRIDE { return wxPoint(0, 0); }
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// in Hildon environment all frames are always shown maximized
@@ -60,15 +60,15 @@ public:
// implementation from now on
// --------------------------
virtual bool SendIdleEvents(wxIdleEvent& event);
virtual bool SendIdleEvents(wxIdleEvent& event) wxOVERRIDE;
protected:
// override wxWindow methods to take into account tool/menu/statusbars
virtual void DoGetClientSize( int *width, int *height ) const;
virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE;
#if wxUSE_MENUS_NATIVE
virtual void DetachMenuBar();
virtual void AttachMenuBar(wxMenuBar *menubar);
virtual void DetachMenuBar() wxOVERRIDE;
virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE;
#endif // wxUSE_MENUS_NATIVE
private: