Reuse base class icon-related functions in wxAuiMDIChildFrame
Don't define GetIcon(), GetIcons() and SetIcon() at all as the base class already implements them and just keep SetIcons(), which can now be marked as overridden as it's inherited from wxTopLevelWindow via wxTDIChildFrame.
This commit is contained in:
@@ -144,11 +144,7 @@ public:
|
||||
|
||||
virtual void SetTitle(const wxString& title);
|
||||
|
||||
virtual void SetIcons(const wxIconBundle& icons);
|
||||
virtual const wxIconBundle& GetIcons() const;
|
||||
|
||||
virtual void SetIcon(const wxIcon& icon);
|
||||
virtual const wxIcon& GetIcon() const;
|
||||
virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE;
|
||||
|
||||
virtual void Activate();
|
||||
virtual bool Destroy() wxOVERRIDE;
|
||||
@@ -171,8 +167,6 @@ public:
|
||||
|
||||
protected:
|
||||
wxAuiMDIParentFrame* m_pMDIParentFrame;
|
||||
wxIcon m_icon;
|
||||
wxIconBundle m_iconBundle;
|
||||
bool m_activateOnCreate;
|
||||
|
||||
#if wxUSE_MENUS
|
||||
|
Reference in New Issue
Block a user