corrected drawing of the bitmaps for the disabled menu items (replaces patch 1632891, closes bug 1632888)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-01-14 20:59:17 +00:00
parent cfbf301d7c
commit 0d3997fd6d
2 changed files with 15 additions and 2 deletions

View File

@@ -98,6 +98,8 @@ All:
wxMSW
- Fix lack of spin control update event when control lost focus
- Corrected drawing of bitmaps for disabled menu items
2.8.1
-----

View File

@@ -421,9 +421,20 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
if ( !bmp.Ok() )
{
// for not checkable bitmaps we should always use unchecked one because
// their checked bitmap is not set
// for not checkable bitmaps we should always use unchecked one
// because their checked bitmap is not set
bmp = GetBitmap(!IsCheckable() || (st & wxODChecked));
#if wxUSE_IMAGE
if ( bmp.Ok() && st & wxODDisabled )
{
// we need to grey out the bitmap as we don't have any specific
// disabled bitmap
wxImage imgGrey = bmp.ConvertToImage().ConvertToGreyscale();
if ( imgGrey.Ok() )
bmp = wxBitmap(imgGrey);
}
#endif // wxUSE_IMAGE
}
if ( bmp.Ok() )