wxIconBundle implementation.
wxTLW::SetIcons() properly implemented for wxMotif, wxGTK, wxMSW, wxX11, wxUniversal Placeholders that just call SetIcon for wxOS2 and wxMac. Regenerated makefiles. Added hardwired wxSYS_ICON_X/Y = 32 for wxGTK. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -296,13 +296,14 @@ int wxTopLevelWindow::GetMinHeight() const
|
||||
// icons
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
void wxTopLevelWindow::SetIcon(const wxIcon& icon)
|
||||
void wxTopLevelWindow::SetIcons(const wxIconBundle& icons)
|
||||
{
|
||||
wxTopLevelWindowNative::SetIcon(icon);
|
||||
wxTopLevelWindowNative::SetIcons(icons);
|
||||
|
||||
if ( ms_drawDecorations && m_renderer )
|
||||
{
|
||||
wxSize size = m_renderer->GetFrameIconSize();
|
||||
const wxIcon& icon = icons.GetIcon( size );
|
||||
|
||||
if ( !icon.Ok() || size.x == -1 )
|
||||
m_titlebarIcon = icon;
|
||||
|
Reference in New Issue
Block a user