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

When drawing wxPropertyGrid check box editor, be consistent with the other editors and use dc.GetTextForeground() for obtaining check box colour

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-02-23 15:24:50 +00:00
parent 9493cc02ee
commit fe63109fc4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/propgrid/editors.cpp
View File

@@ -1400,12 +1400,12 @@ const int wxSCB_SETVALUE_CYCLE = 2;
static void DrawSimpleCheckBox( wxDC& dc, const wxRect& rect, int box_hei, static void DrawSimpleCheckBox( wxDC& dc, const wxRect& rect, int box_hei,
int state, const wxColour& lineCol ) int state )
{ {
// Box rectangle. // Box rectangle.
wxRect r(rect.x+wxPG_XBEFORETEXT,rect.y+((rect.height-box_hei)/2), wxRect r(rect.x+wxPG_XBEFORETEXT,rect.y+((rect.height-box_hei)/2),
box_hei,box_hei); box_hei,box_hei);
wxColour useCol = lineCol; wxColour useCol = dc.GetTextForeground();
if ( state & wxSCB_STATE_UNSPECIFIED ) if ( state & wxSCB_STATE_UNSPECIFIED )
{ {
@@ -1529,14 +1529,14 @@ void wxSimpleCheckBox::OnPaint( wxPaintEvent& WXUNUSED(event) )
dc.SetPen( bgcol ); dc.SetPen( bgcol );
dc.DrawRectangle( rect ); dc.DrawRectangle( rect );
wxColour txcol = GetForegroundColour(); dc.SetTextForeground(GetForegroundColour());
int state = m_state; int state = m_state;
if ( !(state & wxSCB_STATE_UNSPECIFIED) && if ( !(state & wxSCB_STATE_UNSPECIFIED) &&
GetFont().GetWeight() == wxBOLD ) GetFont().GetWeight() == wxBOLD )
state |= wxSCB_STATE_BOLD; state |= wxSCB_STATE_BOLD;
DrawSimpleCheckBox(dc,rect,m_boxHeight,state,txcol); DrawSimpleCheckBox(dc, rect, m_boxHeight, state);
} }
void wxSimpleCheckBox::OnLeftClick( wxMouseEvent& event ) void wxSimpleCheckBox::OnLeftClick( wxMouseEvent& event )
@@ -1629,7 +1629,6 @@ void wxPGCheckBoxEditor::DrawValue( wxDC& dc, const wxRect& rect,
const wxString& WXUNUSED(text) ) const const wxString& WXUNUSED(text) ) const
{ {
int state = wxSCB_STATE_UNCHECKED; int state = wxSCB_STATE_UNCHECKED;
wxColour rectCol = dc.GetTextForeground();
if ( !property->IsValueUnspecified() ) if ( !property->IsValueUnspecified() )
{ {
@@ -1642,7 +1641,7 @@ void wxPGCheckBoxEditor::DrawValue( wxDC& dc, const wxRect& rect,
state |= wxSCB_STATE_UNSPECIFIED; state |= wxSCB_STATE_UNSPECIFIED;
} }
DrawSimpleCheckBox(dc, rect, dc.GetCharHeight(), state, rectCol); DrawSimpleCheckBox(dc, rect, dc.GetCharHeight(), state);
} }
void wxPGCheckBoxEditor::UpdateControl( wxPGProperty* property, void wxPGCheckBoxEditor::UpdateControl( wxPGProperty* property,