From 5d0c8c93026672a4fed387c6d5cc041b75a27680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 25 Sep 2014 12:29:22 +0000 Subject: [PATCH] Make toggle toolbar button emulation on OS X nicer Actually use gray background behind toggled icon. Remove the ugly black frame. Increase rounded rectangle's radius so that it is (barely) visible that the rectangle is rounded. Previously, the code used wxLIGHT_GREY by mistake, which is the same color as the toolbar already uses, so toggled items were rendered with the same background as untoggled, only with an ugly black rectangle around them. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/toolbar.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm index cba55d22b0..56ac64385d 100644 --- a/src/osx/cocoa/toolbar.mm +++ b/src/osx/cocoa/toolbar.mm @@ -537,9 +537,9 @@ void wxToolBarTool::UpdateImages() wxMemoryDC dc; dc.SelectObject( m_alternateBitmap ); - dc.SetPen( wxPen(*wxBLACK) ); - dc.SetBrush( wxBrush( *wxLIGHT_GREY )); - dc.DrawRoundedRectangle( 0, 0, w, h, 2 ); + dc.SetPen(*wxGREY_PEN); + dc.SetBrush(*wxGREY_BRUSH); + dc.DrawRoundedRectangle( 0, 0, w, h, 3 ); dc.DrawBitmap( m_bmpNormal, 0, 0, true ); dc.SelectObject( wxNullBitmap );