use wxRendererNative::DrawItemSelectionRect() to draw wxVListBox items background...

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

diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index ac1d0286da2cb63d0fa4ae46be1089b67dc28289..b14bfd98f960e7fa01433e2943dc3fed9c49f71a 100644 (file)
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -189,6 +189,9 @@ public:
     // change the background colour of the selected cells
     void SetSelectionBackground(const wxColour& col);
 
+    // refreshes only the selected items
+    void RefreshSelected();
+
 
     virtual wxVisualAttributes GetDefaultAttributes() const
     {
@@ -235,7 +238,7 @@ protected:
     void OnKeyDown(wxKeyEvent& event);
     void OnLeftDown(wxMouseEvent& event);
     void OnLeftDClick(wxMouseEvent& event);
-
+    void OnSetOrKillFocus(wxFocusEvent& event);
 
     // common part of all ctors
     void Init();

diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index c7c03d62373deb14131a3638fa91a3d1b6b61c77..c97e9f347c7b55829fe6b1fa2e04a304e28559ba 100644 (file)
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -365,17 +365,6 @@ void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const
 
     wxHtmlRenderingInfo htmlRendInfo;
 
-    // draw the selected cell in selected state
-    if ( IsSelected(n) )
-    {
-        wxHtmlSelection htmlSel;
-        htmlSel.Set(wxPoint(0,0), cell, wxPoint(INT_MAX, INT_MAX), cell);
-        htmlRendInfo.SetSelection(&htmlSel);
-        if ( m_htmlRendStyle )
-            htmlRendInfo.SetStyle(m_htmlRendStyle);
-        htmlRendInfo.GetState().SetSelectionState(wxHTML_SEL_IN);
-    }
-
     // note that we can't stop drawing exactly at the window boundary as then
     // even the visible cells part could be not drawn, so always draw the
     // entire cell

diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index 2a3ca54d1cbce461ab5a6664f0dd6fb3af239648..6879d41cbeca5b26ce5910d26b7387ad40a5a4f3 100644 (file)
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -36,6 +36,7 @@
 
 #include "wx/dcbuffer.h"
 #include "wx/selstore.h"
+#include "wx/renderer.h"
 
 // ----------------------------------------------------------------------------
 // event tables
@@ -47,6 +48,9 @@ BEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow)
     EVT_KEY_DOWN(wxVListBox::OnKeyDown)
     EVT_LEFT_DOWN(wxVListBox::OnLeftDown)
     EVT_LEFT_DCLICK(wxVListBox::OnLeftDClick)
+
+    EVT_SET_FOCUS(wxVListBox::OnSetOrKillFocus)
+    EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus)
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -83,7 +87,10 @@ bool wxVListBox::Create(wxWindow *parent,
     // make sure the native widget has the right colour since we do
     // transparent drawing by default
     SetBackgroundColour(GetBackgroundColour());
-    m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+
+    // leave m_colBgSel in an invalid state: it means for OnDrawBackground()
+    // to use wxRendererNative instead of painting selection bg ourselves
+    m_colBgSel = wxNullColour;
 
     // flicker-free drawing requires this
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
@@ -299,6 +306,16 @@ int wxVListBox::GetNextSelected(unsigned long& cookie) const
     return wxNOT_FOUND;
 }
 
+void wxVListBox::RefreshSelected()
+{
+    // only refresh those items which are currently visible and selected:
+    for ( size_t n = GetVisibleBegin(), end = GetVisibleEnd(); n < end; n++ )
+    {
+        if ( IsSelected(n) )
+            RefreshLine(n);
+    }
+}
+
 // ----------------------------------------------------------------------------
 // wxVListBox appearance parameters
 // ----------------------------------------------------------------------------
@@ -335,25 +352,39 @@ void wxVListBox::OnDrawSeparator(wxDC& WXUNUSED(dc),
 
 void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
 {
-    // we need to render selected and current items differently
-    const bool isSelected = IsSelected(n),
-               isCurrent = IsCurrent(n);
-    if ( isSelected || isCurrent )
+    if ( m_colBgSel.IsOk() )
     {
-        if ( isSelected )
-        {
-            dc.SetBrush(wxBrush(m_colBgSel, wxSOLID));
-        }
-        else // !selected
+        // we need to render selected and current items differently
+        const bool isSelected = IsSelected(n),
+                   isCurrent = IsCurrent(n);
+        if ( isSelected || isCurrent )
         {
-            dc.SetBrush(*wxTRANSPARENT_BRUSH);
+            if ( isSelected )
+            {
+                dc.SetBrush(wxBrush(m_colBgSel, wxSOLID));
+            }
+            else // !selected
+            {
+                dc.SetBrush(*wxTRANSPARENT_BRUSH);
+            }
+            dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN));
+            dc.DrawRectangle(rect);
         }
-
-        dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN));
-
-        dc.DrawRectangle(rect);
+        //else: do nothing for the normal items
+    }
+    else // use wxRendererNative for a more native look&feel:
+    {
+        int flags = 0;
+        if ( IsSelected(n) )
+            flags |= wxCONTROL_SELECTED;
+        if ( IsCurrent(n) )
+            flags |= wxCONTROL_CURRENT;
+        if ( wxWindow::FindFocus() == this )
+            flags |= wxCONTROL_FOCUSED;
+
+        wxRendererNative::Get().DrawItemSelectionRect(
+            wx_const_cast(wxVListBox *, this), dc, rect, flags);
     }
-    //else: do nothing for the normal items
 }
 
 void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
@@ -410,6 +441,15 @@ void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
     }
 }
 
+void wxVListBox::OnSetOrKillFocus(wxFocusEvent& WXUNUSED(event))
+{
+    // we need to repaint the selection when we get the focus since
+    // wxRendererNative in general draws the focused selection differently
+    // from the unfocused selection (see OnDrawItem):
+    RefreshSelected();
+}
+
+
 // ============================================================================
 // wxVListBox keyboard/mouse handling
 // ============================================================================