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

oops, removed duplicate SetIcons[s]() added in last commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-20 15:10:30 +00:00
parent d11e8786ed
commit 05c3f0fc73
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,7 @@ public:
int WXUNUSED(incH) = -1) {} int WXUNUSED(incH) = -1) {}
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
// no toolbar bars // no toolbar
virtual wxToolBar* CreateToolBar( long WXUNUSED(style), virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
wxWindowID WXUNUSED(id), wxWindowID WXUNUSED(id),
const wxString& WXUNUSED(name) ) const wxString& WXUNUSED(name) )
@@ -161,8 +161,10 @@ public:
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR
// no icon // no icon
void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); } virtual void SetIcon(const wxIcon& icon)
void SetIcons( const wxIconBundle &icons ) { m_icons = icons; } { wxTopLevelWindowBase::SetIcon(icon); }
virtual void SetIcons(const wxIconBundle& icons )
{ wxTopLevelWindowBase::SetIcons(icons); }
// no title // no title
void SetTitle( const wxString &title ); void SetTitle( const wxString &title );
@@ -173,8 +175,6 @@ public:
virtual bool IsMaximized() const { return true; } virtual bool IsMaximized() const { return true; }
virtual void Iconize(bool WXUNUSED(iconize) = true) { } virtual void Iconize(bool WXUNUSED(iconize) = true) { }
virtual bool IsIconized() const { return false; } virtual bool IsIconized() const { return false; }
virtual void SetIcon(const wxIcon& WXUNUSED(icon)) { }
virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { }
virtual void Restore() {} virtual void Restore() {}
virtual bool IsTopLevel() const { return false; } virtual bool IsTopLevel() const { return false; }

10
include/wx/gtk1/mdi.h
View File

@@ -152,7 +152,7 @@ public:
int WXUNUSED(incH) = -1) {} int WXUNUSED(incH) = -1) {}
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
// no toolbar bars // no toolbar
virtual wxToolBar* CreateToolBar( long WXUNUSED(style), virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
wxWindowID WXUNUSED(id), wxWindowID WXUNUSED(id),
const wxString& WXUNUSED(name) ) const wxString& WXUNUSED(name) )
@@ -161,8 +161,10 @@ public:
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR
// no icon // no icon
void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); } virtual void SetIcon(const wxIcon& icon)
void SetIcons( const wxIconBundle &icons ) { m_icons = icons; } { wxTopLevelWindowBase::SetIcon(icon); }
virtual void SetIcons(const wxIconBundle& icons )
{ wxTopLevelWindowBase::SetIcons(icons); }
// no title // no title
void SetTitle( const wxString &title ); void SetTitle( const wxString &title );
@@ -173,8 +175,6 @@ public:
virtual bool IsMaximized() const { return true; } virtual bool IsMaximized() const { return true; }
virtual void Iconize(bool WXUNUSED(iconize) = true) { } virtual void Iconize(bool WXUNUSED(iconize) = true) { }
virtual bool IsIconized() const { return false; } virtual bool IsIconized() const { return false; }
virtual void SetIcon(const wxIcon& WXUNUSED(icon)) { }
virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { }
virtual void Restore() {} virtual void Restore() {}
virtual bool IsTopLevel() const { return false; } virtual bool IsTopLevel() const { return false; }