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

revised wxRadioButton draw function

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-23 17:40:56 +00:00
parent 71a21c065d
commit 7bc33811b9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/univ/themes/gtk.cpp
View File

@@ -1010,10 +1010,10 @@ void wxGTKRenderer::DrawRadioButtonBitmap(wxDC& dc,
// draw the normal border // draw the normal border
dc.DrawCircle(xRight/2,yBottom/2,yMid); dc.DrawCircle(xRight/2,yBottom/2,yMid);
wxColor col1, col2; wxColor checkedCol, uncheckedCol;
col1 = wxSCHEME_COLOUR(m_scheme, SHADOW_DARK); checkedCol = wxSCHEME_COLOUR(m_scheme, SHADOW_DARK);
col2 = wxSCHEME_COLOUR(m_scheme, SHADOW_IN); uncheckedCol = wxSCHEME_COLOUR(m_scheme, SHADOW_HIGHLIGHT);
dc.SetBrush(flags & wxCONTROL_CHECKED ? col1 : col2); dc.SetBrush(flags & wxCONTROL_CHECKED ? checkedCol : uncheckedCol);
// inner dot // inner dot
dc.DrawCircle(xRight/2,yBottom/2,yMid/2); dc.DrawCircle(xRight/2,yBottom/2,yMid/2);
@@ -1021,23 +1021,23 @@ void wxGTKRenderer::DrawRadioButtonBitmap(wxDC& dc,
bool drawIt = true; bool drawIt = true;
if ( flags & wxCONTROL_PRESSED ) if ( flags & wxCONTROL_PRESSED )
dc.SetBrush(wxColor(128, 138, 135)); dc.SetBrush(wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED));
else // unchecked and unpressed else // unchecked and unpressed
drawIt = false; drawIt = false;
if ( drawIt ) if ( drawIt )
dc.DrawCircle(xRight/2,yBottom/2,yMid/2); dc.DrawCircle(xRight/2, yBottom/2, yMid/2);
if ( flags & wxCONTROL_PRESSED ) if ( flags & wxCONTROL_PRESSED )
{ {
dc.SetBrush(wxColor(128, 138, 135)); dc.SetBrush(wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED));
drawIt = true; drawIt = true;
} }
else // checked and unpressed else // checked and unpressed
drawIt = false; drawIt = false;
if ( drawIt ) if ( drawIt )
dc.DrawCircle(xRight/2,yBottom/2,yMid/2); dc.DrawCircle(xRight/2, yBottom/2, yMid/2);
} }
void wxGTKRenderer::DrawUpZag(wxDC& dc, void wxGTKRenderer::DrawUpZag(wxDC& dc,