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

applied (slightly modified) patch for loading large/small icons

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-01-11 14:58:19 +00:00
parent 3cc8e98a96
commit a4352768d7
1 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/msw/gdiimage.cpp
View File

@@ -401,7 +401,41 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
wxSize size; wxSize size;
#ifdef __WIN32__ #ifdef __WIN32__
HICON hicon = ::ExtractIcon(wxGetInstance(), name, 0 /* first */); HICON hicon = NULL;
// were we asked for a large icon?
if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
desiredHeight == ::GetSystemMetrics(SM_CYICON) )
{
// get the first large icon from file
if ( !::ExtractIconEx(name, 0, &hicon, NULL, 1) )
{
// it is not an error, but it might still be useful to be informed
// about it optionally
wxLogTrace(_T("iconload"),
_T("No large icons found in the file '%s'."),
name.c_str());
}
}
else if ( desiredWidth == ::GetSystemMetrics(SM_CXSMICON) &&
desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
{
// get the first small icon from file
if ( !::ExtractIconEx(name, 0, NULL, &hicon, 1) )
{
wxLogTrace(_T("iconload"),
_T("No small icons found in the file '%s'."),
name.c_str());
}
}
//else: not standard size, load below
if ( !hicon )
{
// take any (the first one) icon from the file by default
hicon = ::ExtractIcon(wxGetInstance(), name, 0 /* first */);
}
if ( !hicon ) if ( !hicon )
{ {
wxLogSysError(_T("Failed to load icon from the file '%s'"), wxLogSysError(_T("Failed to load icon from the file '%s'"),
@@ -420,9 +454,10 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
if ( (desiredWidth != -1 && desiredWidth != size.x) || if ( (desiredWidth != -1 && desiredWidth != size.x) ||
(desiredHeight != -1 && desiredHeight != size.y) ) (desiredHeight != -1 && desiredHeight != size.y) )
{ {
wxLogDebug(_T("Returning FALSE from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"), wxLogTrace(_T("iconload"),
size.x, size.y, _T("Returning FALSE from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),
desiredWidth, desiredHeight); size.x, size.y,
desiredWidth, desiredHeight);
::DestroyIcon(hicon); ::DestroyIcon(hicon);