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

don't call ::GetSystemMetrics() unnecessarily in wxGetHiconSize()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-10 22:43:14 +00:00
parent c1fa6f5245
commit ab3d29eaab
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/gdiimage.cpp
View File

@@ -567,12 +567,10 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon)) wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))
{ {
// default icon size on this hardware wxSize size;
// usually 32x32 but can be other (smaller) on pocket devices
wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON));
#ifndef __WXWINCE__ #ifndef __WXWINCE__
if (hicon) if ( hicon )
{ {
ICONINFO info; ICONINFO info;
if ( !::GetIconInfo(hicon, &info) ) if ( !::GetIconInfo(hicon, &info) )
@@ -596,7 +594,14 @@ wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))
::DeleteObject(info.hbmColor); ::DeleteObject(info.hbmColor);
} }
} }
#endif
if ( !size.x )
#endif // !__WXWINCE__
{
// use default icon size on this hardware
size.x = ::GetSystemMetrics(SM_CXICON);
size.y = ::GetSystemMetrics(SM_CYICON);
}
return size; return size;
} }