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

use wxOVERRIDE in wxMSW sources

Browse Source
This commit is contained in:
Paul Cornett
2016-09-23 07:59:11 -07:00
parent 9b477e46e5
commit 9b19a6e529
121 changed files with 1454 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/msw/frame.h
View File

@@ -43,7 +43,7 @@ public:
virtual ~wxFrame();
// implement base class pure virtuals
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
// implementation only from now on
// -------------------------------
@@ -55,7 +55,7 @@ public:
#if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = wxID_ANY,
const wxString& name = wxToolBarNameStr);
const wxString& name = wxToolBarNameStr) wxOVERRIDE;
#endif // wxUSE_TOOLBAR
// Status bar
@@ -63,7 +63,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;
// Hint to tell framework which status bar to use: the default is to use
// native one for the platforms which support it (Win32), the generic one
@@ -87,12 +87,12 @@ public:
#endif // tooltips
// override the base class function to handle iconized/maximized frames
virtual void SendSizeEvent(int flags = 0);
virtual void SendSizeEvent(int flags = 0) wxOVERRIDE;
virtual wxPoint GetClientAreaOrigin() const;
virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
// override base class version to add menu bar accel processing
virtual bool MSWTranslateMessage(WXMSG *msg)
virtual bool MSWTranslateMessage(WXMSG *msg) wxOVERRIDE
{
return MSWDoTranslateMessage(this, msg);
}
@@ -100,18 +100,18 @@ public:
// window proc for the frames
virtual WXLRESULT MSWWindowProc(WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam);
WXLPARAM lParam) wxOVERRIDE;
#if wxUSE_MENUS
// get the currently active menu: this is the same as the frame menu for
// normal frames but is overridden by wxMDIParentFrame
virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; }
virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu);
virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu) wxOVERRIDE;
virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu) wxOVERRIDE;
// Look up the menu in the menu bar.
virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu);
virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu) wxOVERRIDE;
#endif // wxUSE_MENUS
#if wxUSE_TASKBARBUTTON
@@ -128,12 +128,12 @@ protected:
void Init();
// 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_NATIVE
// perform MSW-specific action when menubar is changed
virtual void AttachMenuBar(wxMenuBar *menubar);
virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE;
// a plug in for MDI frame classes which need to do something special when
// the menubar is set
@@ -153,11 +153,11 @@ protected:
virtual WXHICON GetDefaultIcon() const;
#if wxUSE_TOOLBAR
virtual void PositionToolBar();
virtual void PositionToolBar() wxOVERRIDE;
#endif // wxUSE_TOOLBAR
#if wxUSE_STATUSBAR
virtual void PositionStatusBar();
virtual void PositionStatusBar() wxOVERRIDE;
static bool m_useNativeStatusBar;
#endif // wxUSE_STATUSBAR