made wxTLW::SetIcon() non-virtual, it was already implemented in terms of
SetIcons() in most of the ports, now do it in all of them git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -315,6 +315,26 @@ bool wxTopLevelWindowBase::IsAlwaysMaximized() const
|
||||
#endif
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// icons
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxIcon wxTopLevelWindowBase::GetIcon() const
|
||||
{
|
||||
return m_icons.IsEmpty() ? wxIcon() : m_icons.GetIcon( -1 );
|
||||
}
|
||||
|
||||
void wxTopLevelWindowBase::SetIcon(const wxIcon& icon)
|
||||
{
|
||||
// passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
|
||||
// have any icon), but adding an invalid icon to wxIconBundle is not
|
||||
wxIconBundle icons;
|
||||
if ( icon.Ok() )
|
||||
icons.AddIcon(icon);
|
||||
|
||||
SetIcons(icons);
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// event handlers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user