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

fixed wxArtProvider::GetSizeHint() to return 16x16 for wxART_FRAME_ICON in non-wxGTK ports

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-10-16 18:53:58 +00:00
parent ab5e7b0274
commit 04a8c1985b
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -98,7 +98,8 @@ All:
All (GUI): All (GUI):
- Fixed wxHTML's pagebreaks computation in tables (D.J.Stauffer). - Fixed wxHTML's pagebreaks computation in tables (D.J.Stauffer).
- Fixed wxRichTextCtrl input that uses Alt on Mac OS X, for example Polish Pro input. - Fixed wxRichTextCtrl input that uses Alt on Mac OS X, for example
Polish Pro input.
- Fixed wxHtmlWindow::SelectionToText() to correctly insert newlines after - Fixed wxHtmlWindow::SelectionToText() to correctly insert newlines after
single-cell paragraphs. single-cell paragraphs.
@@ -110,6 +111,7 @@ All (Unix):
wxMSW: wxMSW:
- Restored generation of events for accelerators when there is no menu bar. - Restored generation of events for accelerators when there is no menu bar.
- Fixed wxArtProvider::GetSizeHint() to return 16x16 for wxART_FRAME_ICON.
wxGTK: wxGTK:

13
src/common/artprov.cpp
View File

@@ -30,6 +30,10 @@
#include "wx/module.h" #include "wx/module.h"
#endif #endif
#ifdef __WXMSW__
#include "wx/msw/wrapwin.h"
#endif
// =========================================================================== // ===========================================================================
// implementation // implementation
// =========================================================================== // ===========================================================================
@@ -272,7 +276,14 @@ wxArtProvider::~wxArtProvider()
else if (client == wxART_MENU) else if (client == wxART_MENU)
return wxSize(16, 15); return wxSize(16, 15);
else if (client == wxART_FRAME_ICON) else if (client == wxART_FRAME_ICON)
return wxSize(16, 15); {
#ifdef __WXMSW__
return wxSize(::GetSystemMetrics(SM_CXSMICON),
::GetSystemMetrics(SM_CYSMICON));
#else
return wxSize(16, 16);
#endif // __WXMSW__/!__WXMSW__
}
else if (client == wxART_CMN_DIALOG || client == wxART_MESSAGE_BOX) else if (client == wxART_CMN_DIALOG || client == wxART_MESSAGE_BOX)
return wxSize(32, 32); return wxSize(32, 32);
else if (client == wxART_HELP_BROWSER) else if (client == wxART_HELP_BROWSER)