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

Make wxRenderer::DrawItemSelectionRect() draw a focus outline of wxCONTROL_CURRENT and wxCONTROL_FOCUSED is given, blind patch for wxMac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-10-17 20:57:01 +00:00
parent e00b31799c
commit ce0cf2b871
6 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/generic/renderg.cpp
View File

@@ -37,6 +37,10 @@
#include "wx/splitter.h"
#include "wx/dcmirror.h"
#ifdef __WXMAC__
#include "wx/mac/private.h"
#endif
// ----------------------------------------------------------------------------
// wxRendererGeneric: our wxRendererNative implementation
// ----------------------------------------------------------------------------
@@ -635,10 +639,17 @@ wxRendererGeneric::DrawPushButton(wxWindow *win,
}
void
#ifdef __WXMAC__
wxRendererGeneric::DrawItemSelectionRect(wxWindow * win,
wxDC& dc,
const wxRect& rect,
int flags)
#else
wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
wxDC& dc,
const wxRect& rect,
int flags)
#endif
{
wxBrush brush;
if ( flags & wxCONTROL_SELECTED )
@@ -658,7 +669,14 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
}
dc.SetBrush(brush);
dc.SetPen(flags & wxCONTROL_CURRENT ? *wxBLACK_PEN : *wxTRANSPARENT_PEN);
if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)
#ifdef __WXMAC__
&& IsControlActive( (ControlRef)win->GetHandle() )
#endif
)
dc.SetPen( *wxBLACK_PEN );
else
dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle( rect );
}