fix wxODCB_PAINTING_SELECTED not being always set (patch 1719364)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 34940a642713a593ab967c182c3af826a73df2ec..3e62b8349d553f1260ea780ae7d894b50af3d636 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -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?
     dc.SetFont(m_useFont);
 
     // TODO: Maybe this code could be moved to wxVListBox::OnPaint?
     dc.SetFont(m_useFont);
 

+    int flags = 0;
+

     // Set correct text colour for selected items
     if ( wxVListBox::GetSelection() == (int) n )
     // Set correct text colour for selected items
     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