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

Fix setting frame icon when using non-standard icon sizes in wxMSW.

Browse Source 
Set the closest (and larger, if possible) icon if the icon of exactly the
system icon size is not available. This fixes setting the icons when using
custom DPI settings under MSW as the standard icon size may be different from
the standard 32*32 in this case.

This also improves wxIconBundle::GetIcon() to make its behaviour when the icon
with exactly the given size is not found more flexible as a side effect.

Closes #13891.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-01-24 22:17:47 +00:00
parent cd747e1598
commit d928f01967
5 changed files with 140 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
interface/wx/iconbndl.h
View File

@@ -21,6 +21,28 @@
class wxIconBundle : public wxGDIObject
{
public:
/**
The elements of this enum determine what happens if GetIcon() doesn't
find the icon of exactly the requested size.
@since 2.9.4
*/
enum
{
/// Return invalid icon if exact size is not found.
FALLBACK_NONE = 0,
/// Return the icon of the system icon size if exact size is not found.
/// May be combined with other non-NONE enum elements to determine what
/// happens if the system icon size is not found neither.
FALLBACK_SYSTEM = 1,
/// Return the icon of closest larger size or, if there is no icon of
/// larger size in the bundle, the closest icon of smaller size.
FALLBACK_NEAREST_LARGER = 2
};
/**
Default ctor.
*/
@@ -85,19 +107,31 @@ public:
void AddIcon(const wxIcon& icon);
/**
Returns the icon with the given size; if no such icon exists, returns
the icon with size @c wxSYS_ICON_X and @c wxSYS_ICON_Y; if no such icon
exists, returns the first icon in the bundle.
Returns the icon with the given size.
If size = wxDefaultSize, returns the icon with size @c wxSYS_ICON_X and
@c wxSYS_ICON_Y.
If @a size is ::wxDefaultSize, it is interpreted as the standard system
icon size, i.e. the size returned by wxSystemSettings::GetMetric() for
@c wxSYS_ICON_X and @c wxSYS_ICON_Y.
If the bundle contains an icon with exactly the requested size, it's
always returned. Otherwise, the behaviour depends on the flags. If only
::FALLBACK_NONE is given, the function returns an invalid icon. If
::FALLBACK_SYSTEM is given, it tries to find the icon of standard
system size, regardless of the size passed as parameter. Otherwise, or
if the icon system size is not found neither, but
::FALLBACK_NEAREST_LARGER flag is specified, the function returns the
smallest icon of the size larger than the requested one or, if this
fails too, just the icon closest to the specified size.
The @a flags parameter is available only since wxWidgets 2.9.4.
*/
wxIcon GetIcon(const wxSize& size) const;
wxIcon GetIcon(const wxSize& size, int flags = FALLBACK_SYSTEM) const;
/**
Same as @code GetIcon( wxSize( size, size ) ) @endcode.
*/
wxIcon GetIcon(wxCoord size = wxDefaultCoord) const;
wxIcon GetIcon(wxCoord size = wxDefaultCoord,
int flags = FALLBACK_SYSTEM) const;
/**
Returns the icon with exactly the given size or ::wxNullIcon if this