fixed wxStdRenderer::DrawButtonLabel() to not change text colour, otherwise menu items below a disabled item would be rendered incorrectly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8c70a78958
commit
ede5511517
@ -257,6 +257,8 @@ void wxStdRenderer::DrawButtonLabel(wxDC& dc,
|
||||
int indexAccel,
|
||||
wxRect *rectBounds)
|
||||
{
|
||||
wxDCTextColourChanger clrChanger(dc);
|
||||
|
||||
wxRect rectLabel = rect;
|
||||
if ( !label.empty() && (flags & wxCONTROL_DISABLED) )
|
||||
{
|
||||
@ -267,13 +269,13 @@ void wxStdRenderer::DrawButtonLabel(wxDC& dc,
|
||||
}
|
||||
|
||||
// draw shadow of the text
|
||||
dc.SetTextForeground(m_penHighlight.GetColour());
|
||||
clrChanger.Set(m_penHighlight.GetColour());
|
||||
wxRect rectShadow = rect;
|
||||
rectShadow.Offset(1, 1);
|
||||
dc.DrawLabel(label, rectShadow, alignment, indexAccel);
|
||||
|
||||
// make the main label text grey
|
||||
dc.SetTextForeground(m_penDarkGrey.GetColour());
|
||||
clrChanger.Set(m_penDarkGrey.GetColour());
|
||||
|
||||
if ( flags & wxCONTROL_FOCUSED )
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user