X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2cbae6bb8140fd4b06208cf7ec1d4e2fb99d9e3..ef6ece2352e739f843d9fc08d96d46b6467b83d6:/src/generic/listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 0bdc1e54fd..ec924ef4c1 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -1897,6 +1897,19 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         x += wCol;
     }
+
+    // Fill in what's missing to the right of the columns, otherwise we will
+    // leave an unpainted area when columns are removed (and it looks better)
+    if ( x < w )
+    {
+        wxRendererNative::Get().DrawHeaderButton
+                                (
+                                    this,
+                                    dc,
+                                    wxRect(x, HEADER_OFFSET_Y, w - x, h),
+                                    0
+                                );
+    }
 }
 
 void wxListHeaderWindow::DrawCurrent()
@@ -2860,9 +2873,11 @@ void wxListMainWindow::HighlightAll( bool on )
     }
 }
 
-void wxListMainWindow::OnChildFocus(wxChildFocusEvent& event)
+void wxListMainWindow::OnChildFocus(wxChildFocusEvent& WXUNUSED(event))
 {
-    // do nothing
+    // Do nothing here.  This prevents the default handler in wxScrolledWindow
+    // from needlessly scrolling the window when the edit control is
+    // dismissed.  See ticket #9563.
 }
 
 void wxListMainWindow::SendNotify( size_t line,