Commit wxComboCtrl clipping patch from J. Salli

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-03 13:21:29 +00:00
parent 70476471b7
commit 118f5fbd06
5 changed files with 34 additions and 11 deletions

View File

@@ -1059,12 +1059,15 @@ void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc, const wxRect& rect, int it
if ( GetVListBoxComboPopup()->IsCurrent((size_t)item) ||
(flags & wxODCB_PAINTING_CONTROL) )
{
int focusFlag = wxCONTROL_SELECTED;
int bgFlags = wxCONTROL_SELECTED;
if ( (flags & wxODCB_PAINTING_CONTROL) != wxODCB_PAINTING_CONTROL )
focusFlag |= wxCONTROL_ISSUBMENU;
DrawFocusBackground(dc, rect, focusFlag );
{
bgFlags |= wxCONTROL_ISSUBMENU;
PrepareBackground(dc, rect, bgFlags);
}
else if ( HasFlag(wxCB_READONLY) )
PrepareBackground(dc, rect, bgFlags);
}
//else: do nothing for the normal items
}