From 05c3f0fc73d9124061c08e3d707b4e3d6bab4ff4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Mar 2005 15:10:30 +0000 Subject: [PATCH] oops, removed duplicate SetIcons[s]() added in last commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/mdi.h | 10 +++++----- include/wx/gtk1/mdi.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index 08ba0abef2..e261ea8d08 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -152,7 +152,7 @@ public: int WXUNUSED(incH) = -1) {} #if wxUSE_TOOLBAR - // no toolbar bars + // no toolbar virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), const wxString& WXUNUSED(name) ) @@ -161,8 +161,10 @@ public: #endif // wxUSE_TOOLBAR // no icon - void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); } - void SetIcons( const wxIconBundle &icons ) { m_icons = icons; } + virtual void SetIcon(const wxIcon& icon) + { wxTopLevelWindowBase::SetIcon(icon); } + virtual void SetIcons(const wxIconBundle& icons ) + { wxTopLevelWindowBase::SetIcons(icons); } // no title void SetTitle( const wxString &title ); @@ -173,8 +175,6 @@ public: virtual bool IsMaximized() const { return true; } virtual void Iconize(bool WXUNUSED(iconize) = true) { } virtual bool IsIconized() const { return false; } - virtual void SetIcon(const wxIcon& WXUNUSED(icon)) { } - virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { } virtual void Restore() {} virtual bool IsTopLevel() const { return false; } diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h index 08ba0abef2..e261ea8d08 100644 --- a/include/wx/gtk1/mdi.h +++ b/include/wx/gtk1/mdi.h @@ -152,7 +152,7 @@ public: int WXUNUSED(incH) = -1) {} #if wxUSE_TOOLBAR - // no toolbar bars + // no toolbar virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), const wxString& WXUNUSED(name) ) @@ -161,8 +161,10 @@ public: #endif // wxUSE_TOOLBAR // no icon - void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); } - void SetIcons( const wxIconBundle &icons ) { m_icons = icons; } + virtual void SetIcon(const wxIcon& icon) + { wxTopLevelWindowBase::SetIcon(icon); } + virtual void SetIcons(const wxIconBundle& icons ) + { wxTopLevelWindowBase::SetIcons(icons); } // no title void SetTitle( const wxString &title ); @@ -173,8 +175,6 @@ public: virtual bool IsMaximized() const { return true; } virtual void Iconize(bool WXUNUSED(iconize) = true) { } virtual bool IsIconized() const { return false; } - virtual void SetIcon(const wxIcon& WXUNUSED(icon)) { } - virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { } virtual void Restore() {} virtual bool IsTopLevel() const { return false; } -- 2.45.2