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

use wxIconBundle::GetIconOfExactSize() instead of duplicating its code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-07 23:54:12 +00:00
parent 9b5933bcbc
commit f605c2584f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/toplevel.cpp
View File

@@ -982,15 +982,15 @@ void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons)
wxTopLevelWindowBase::SetIcons(icons); wxTopLevelWindowBase::SetIcons(icons);
#if !defined(__WXMICROWIN__) #if !defined(__WXMICROWIN__)
const wxIcon& sml = icons.GetIcon(16); const wxIcon& sml = icons.GetIconOfExactSize(16);
if( sml.Ok() && sml.GetWidth() == 16 && sml.GetHeight() == 16 ) if( sml.Ok() )
{ {
::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_SMALL, ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_SMALL,
(LPARAM)GetHiconOf(sml) ); (LPARAM)GetHiconOf(sml) );
} }
const wxIcon& big = icons.GetIcon(32); const wxIcon& big = icons.GetIconOfExactSize(32);
if( big.Ok() && big.GetWidth() == 32 && big.GetHeight() == 32 ) if( big.Ok() )
{ {
::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG, ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG,
(LPARAM)GetHiconOf(big) ); (LPARAM)GetHiconOf(big) );

4
src/os2/toplevel.cpp
View File

@@ -1004,9 +1004,9 @@ void wxTopLevelWindowOS2::SetIcons(
// //
wxTopLevelWindowBase::SetIcons(rIcons); wxTopLevelWindowBase::SetIcons(rIcons);
const wxIcon& vIcon = rIcons.GetIcon(32); const wxIcon& vIcon = rIcons.GetIconOfExactSize(32);
if (vIcon.Ok() && vIcon.GetWidth() == 32 && vIcon.GetHeight() == 32) if (vIcon.Ok())
{ {
::WinSendMsg( m_hFrame ::WinSendMsg( m_hFrame
,WM_SETICON ,WM_SETICON