Fix selection background colour in wxHtmlWindow

Use inactive selection colour when the window doesn't have focus.

include/wx/html/htmlcell.h

@@ -115,8 +115,17 @@ public:
 class WXDLLIMPEXP_HTML wxDefaultHtmlRenderingStyle : public wxHtmlRenderingStyle
 {
 public:
+    explicit wxDefaultHtmlRenderingStyle(const wxWindowBase* wnd = NULL)
+        : m_wnd(wnd)
+    {}
+
     virtual wxColour GetSelectedTextColour(const wxColour& clr) wxOVERRIDE;
     virtual wxColour GetSelectedTextBgColour(const wxColour& clr) wxOVERRIDE;
+
+private:
+    const wxWindowBase* const m_wnd;
+
+    wxDECLARE_NO_COPY_CLASS(wxDefaultHtmlRenderingStyle);
 };
 
 

src/generic/htmllbox.cpp

@@ -159,7 +159,9 @@ private:
 class wxHtmlListBoxStyle : public wxDefaultHtmlRenderingStyle
 {
 public:
-    wxHtmlListBoxStyle(const wxHtmlListBox& hlbox) : m_hlbox(hlbox) { }
+    wxHtmlListBoxStyle(const wxHtmlListBox& hlbox)
+        : wxDefaultHtmlRenderingStyle(&hlbox), m_hlbox(hlbox)
+    { }
 
     virtual wxColour GetSelectedTextColour(const wxColour& colFg) wxOVERRIDE
     {

src/html/htmlcell.cpp

@@ -65,7 +65,12 @@ wxColour
 wxDefaultHtmlRenderingStyle::
 GetSelectedTextBgColour(const wxColour& WXUNUSED(clr))
 {
-    return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+    // By default we use the fixed standard selection colour, but if we're
+    // associated with a window use the colour appropriate for the window
+    // state, i.e. grey out selection when it's not in focus.
+
+    return wxSystemSettings::GetColour(!m_wnd || m_wnd->HasFocus() ?
+        wxSYS_COLOUR_HIGHLIGHT : wxSYS_COLOUR_BTNSHADOW);
 }
 
 

src/html/htmlwin.cpp

@@ -1138,7 +1138,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
     dc->SetLayoutDirection(GetLayoutDirection());
 
     wxHtmlRenderingInfo rinfo;
-    wxDefaultHtmlRenderingStyle rstyle;
+    wxDefaultHtmlRenderingStyle rstyle(this);
     rinfo.SetSelection(m_selection);
     rinfo.SetStyle(&rstyle);
     m_Cell->Draw(*dc, 0, 0,