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

Icons fetched from wxMimeTypesManager did not get the width/height of

Browse Source 
the icon, now they do.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-07-15 18:29:52 +00:00
parent 28c98a77e9
commit 6bad4c327c
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/private.h
View File

@@ -478,6 +478,11 @@ inline bool wxStyleHasBorder(long style)
// may return NULL // may return NULL
extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd); extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
// Get the size of an icon
wxSize wxGetHiconSize(HICON hicon);
#endif // wxUSE_GUI #endif // wxUSE_GUI
#endif #endif

7
src/msw/gdiimage.cpp
View File

@@ -184,7 +184,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
// private functions // private functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static wxSize GetHiconSize(HICON hicon);
#endif #endif
// __MICROWIN__ // __MICROWIN__
@@ -466,7 +465,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
return FALSE; return FALSE;
} }
size = GetHiconSize(hicon); size = wxGetHiconSize(hicon);
#else // Win16 #else // Win16
HICON hicon = ReadIconFile((wxChar *)name.c_str(), HICON hicon = ReadIconFile((wxChar *)name.c_str(),
wxGetInstance(), wxGetInstance(),
@@ -551,7 +550,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
} }
} }
wxSize size = GetHiconSize(hicon); wxSize size = wxGetHiconSize(hicon);
icon->SetSize(size.x, size.y); icon->SetSize(size.x, size.y);
icon->SetHICON((WXHICON)hicon); icon->SetHICON((WXHICON)hicon);
@@ -563,7 +562,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
// private functions // private functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static wxSize GetHiconSize(HICON hicon) wxSize wxGetHiconSize(HICON hicon)
{ {
wxSize size(32, 32); // default wxSize size(32, 32); // default

4
src/msw/mimetype.cpp
View File

@@ -41,7 +41,7 @@
#ifdef __WXMSW__ #ifdef __WXMSW__
#include "wx/msw/registry.h" #include "wx/msw/registry.h"
#include "windows.h" #include "wx/msw/private.h"
#endif // OS #endif // OS
#include "wx/msw/mimetype.h" #include "wx/msw/mimetype.h"
@@ -374,6 +374,8 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon,
default: default:
icon->SetHICON((WXHICON)hIcon); icon->SetHICON((WXHICON)hIcon);
wxSize size = wxGetHiconSize(hIcon);
icon->SetSize(size);
if ( iconIndex ) if ( iconIndex )
*iconIndex = nIndex; *iconIndex = nIndex;
if ( iconFile ) if ( iconFile )