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

24
include/wx/gtk/mdi.h
View File

@@ -49,13 +49,13 @@ public:
// we don't store the active child in m_currentChild unlike the base class
// version so override this method to find it dynamically
virtual wxMDIChildFrame *GetActiveChild() const;
virtual wxMDIChildFrame *GetActiveChild() const wxOVERRIDE;
// implement base class pure virtuals
// ----------------------------------
virtual void ActivateNext();
virtual void ActivatePrevious();
virtual void ActivateNext() wxOVERRIDE;
virtual void ActivatePrevious() wxOVERRIDE;
static bool IsTDI() { return true; }
@@ -63,10 +63,10 @@ public:
bool m_justInserted;
virtual void OnInternalIdle();
virtual void OnInternalIdle() wxOVERRIDE;
protected:
virtual void DoGetClientSize(int* width, int* height) const;
virtual void DoGetClientSize(int* width, int* height) const wxOVERRIDE;
private:
friend class wxMDIChildFrame;
@@ -106,18 +106,18 @@ public:
virtual ~wxMDIChildFrame();
virtual void SetMenuBar( wxMenuBar *menu_bar );
virtual wxMenuBar *GetMenuBar() const;
virtual void SetMenuBar( wxMenuBar *menu_bar ) wxOVERRIDE;
virtual wxMenuBar *GetMenuBar() const wxOVERRIDE;
virtual void Activate();
virtual void Activate() wxOVERRIDE;
virtual void SetTitle(const wxString& title);
virtual void SetTitle(const wxString& title) wxOVERRIDE;
// implementation
void OnActivate( wxActivateEvent& event );
void OnMenuHighlight( wxMenuEvent& event );
virtual void GTKHandleRealized();
virtual void GTKHandleRealized() wxOVERRIDE;
wxMenuBar *m_menuBar;
bool m_justInserted;
@@ -142,10 +142,10 @@ public:
~wxMDIClientWindow();
virtual bool CreateClient(wxMDIParentFrame *parent,
long style = wxVSCROLL | wxHSCROLL);
long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE;
private:
virtual void AddChildGTK(wxWindowGTK* child);
virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE;
DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
};