From 0f3a84fc724fa7eb61590e6d981d53c0e34b6a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 26 Oct 2014 11:44:47 +0000 Subject: [PATCH] Use subtler grey for emulated toolbar toggle on OS X Use a lighter shade of gray to avoid problems with user icons and to match the look of OS X 10.10's rendering of selected toolbar items. Fixes #16645. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/toolbar.mm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm index 05787bf44a..26494f229b 100644 --- a/src/osx/cocoa/toolbar.mm +++ b/src/osx/cocoa/toolbar.mm @@ -568,9 +568,12 @@ void wxToolBarTool::UpdateImages() m_alternateBitmap = wxBitmap( w, h ); wxMemoryDC dc; - dc.SelectObject( m_alternateBitmap ); - dc.SetPen(*wxGREY_PEN); - dc.SetBrush(*wxGREY_BRUSH); + dc.SelectObject(m_alternateBitmap); + // This color corresponds to OS X Yosemite's rendering of selected toolbar items + // See also http://trac.wxwidgets.org/ticket/16645 + wxColour grey(0xB9, 0xB9, 0xB9); + dc.SetPen(grey); + dc.SetBrush(grey); dc.DrawRoundedRectangle( 0, 0, w, h, 3 ); dc.DrawBitmap( m_bmpNormal, 0, 0, true ); dc.SelectObject( wxNullBitmap );