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

fix wxODCB_PAINTING_SELECTED not being always set (patch 1719364)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-05-23 23:58:09 +00:00
parent 86d870753c
commit b4ff336e1d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/odcombo.cpp
View File

@@ -116,7 +116,7 @@ void wxVListBoxComboPopup::PaintComboControl( wxDC& dc, const wxRect& rect )
if ( m_value >= 0 ) if ( m_value >= 0 )
{ {
OnDrawItem(dc,rect,m_value,wxODCB_PAINTING_CONTROL); OnDrawItem(dc,rect,m_value,flags);
return; return;
} }
} }
@@ -129,13 +129,20 @@ void wxVListBoxComboPopup::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) co
// TODO: Maybe this code could be moved to wxVListBox::OnPaint? // TODO: Maybe this code could be moved to wxVListBox::OnPaint?
dc.SetFont(m_useFont); dc.SetFont(m_useFont);
int flags = 0;
// Set correct text colour for selected items // Set correct text colour for selected items
if ( wxVListBox::GetSelection() == (int) n ) if ( wxVListBox::GetSelection() == (int) n )
{
dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) ); dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
flags |= wxODCB_PAINTING_SELECTED;
}
else else
{
dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) ); dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
}
OnDrawItem(dc,rect,(int)n,0); OnDrawItem(dc,rect,(int)n,flags);
} }
wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const