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

fixed wxStdRenderer::DrawButtonLabel() to not change text colour, otherwise menu items below a disabled item would be rendered incorrectly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-12-14 13:54:06 +00:00
parent 8c70a78958
commit ede5511517
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/univ/stdrend.cpp
View File

@@ -257,6 +257,8 @@ void wxStdRenderer::DrawButtonLabel(wxDC& dc,
int indexAccel, int indexAccel,
wxRect *rectBounds) wxRect *rectBounds)
{ {
wxDCTextColourChanger clrChanger(dc);
wxRect rectLabel = rect; wxRect rectLabel = rect;
if ( !label.empty() && (flags & wxCONTROL_DISABLED) ) if ( !label.empty() && (flags & wxCONTROL_DISABLED) )
{ {
@@ -267,13 +269,13 @@ void wxStdRenderer::DrawButtonLabel(wxDC& dc,
} }
// draw shadow of the text // draw shadow of the text
dc.SetTextForeground(m_penHighlight.GetColour()); clrChanger.Set(m_penHighlight.GetColour());
wxRect rectShadow = rect; wxRect rectShadow = rect;
rectShadow.Offset(1, 1); rectShadow.Offset(1, 1);
dc.DrawLabel(label, rectShadow, alignment, indexAccel); dc.DrawLabel(label, rectShadow, alignment, indexAccel);
// make the main label text grey // make the main label text grey
dc.SetTextForeground(m_penDarkGrey.GetColour()); clrChanger.Set(m_penDarkGrey.GetColour());
if ( flags & wxCONTROL_FOCUSED ) if ( flags & wxCONTROL_FOCUSED )
{ {