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

Applied patch [ 892543 ] wxUniversal: Bitmaps in disabled menu items

Browse Source 
Christian Sturmlechner


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-02-08 12:38:31 +00:00
parent 1a527fbc0a
commit dba6b4f880
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/univ/menu.cpp
View File

@@ -585,6 +585,21 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
if ( item == GetCurrentItem() )
flags |= wxCONTROL_SELECTED;
wxBitmap bmp;
if ( !item->IsEnabled() )
{
bmp = item->GetDisabledBitmap();
}
if ( !bmp.Ok() )
{
// strangely enough, for unchecked item we use the
// "checked" bitmap because this is the default one - this
// explains this strange boolean expression
bmp = item->GetBitmap(!item->IsCheckable() || item->IsChecked());
}
rend->DrawMenuItem
(
dc,
@@ -592,10 +607,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
gi,
item->GetLabel(),
item->GetAccelString(),
// strangely enough, for unchecked item we use the
// "checked" bitmap because this is the default one - this
// explains this strange boolean expression
item->GetBitmap(!item->IsCheckable() || item->IsChecked()),
bmp,
flags,
item->GetAccelIndex()
);
@@ -1487,6 +1499,8 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
m_radioGroup.start = -1;
m_isRadioGroupStart = FALSE;
m_bmpDisabled = wxNullBitmap;
UpdateAccelInfo();
}