Remove remaining bits of marker drawing during resizing

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

diff --git a/include/wx/generic/headerctrlg.h b/include/wx/generic/headerctrlg.h
index 944bd4381525228aaeea21e167bc5ef3627168bb..8c9a842d3c5cfd5501395215bb822a813928047e 100644 (file)
--- a/include/wx/generic/headerctrlg.h
+++ b/include/wx/generic/headerctrlg.h
@@ -137,9 +137,6 @@ private:
     // given column plus its minimal width and return the effective width
     int ConstrainByMinWidth(unsigned int col, int& xPhysical);
 
     // given column plus its minimal width and return the effective width
     int ConstrainByMinWidth(unsigned int col, int& xPhysical);
 

-    // update the current position of the resizing marker
-    void UpdateResizingMarker(int xPhysical);
-

     // update the information displayed while a column is being moved around
     void UpdateReorderingMarker(int xPhysical);
 
     // update the information displayed while a column is being moved around
     void UpdateReorderingMarker(int xPhysical);
 

diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp
index 4c70667487b14887742ab109143cf811a8175b6a..ac50c2e17355fec287acf83a95bbc7e50213fec2 100644 (file)
--- a/src/generic/headerctrlg.cpp
+++ b/src/generic/headerctrlg.cpp
@@ -258,26 +258,14 @@ void wxHeaderCtrl::ClearMarkers()
     dcover.Clear();
 }
 
     dcover.Clear();
 }
 

-void wxHeaderCtrl::UpdateResizingMarker(int xPhysical)
-{
-    wxClientDC dc(this);
-
-    wxDCOverlay dcover(m_overlay, &dc);
-    dcover.Clear();
-
-    // unfortunately drawing the marker over the parent window doesn't work as
-    // it's usually covered by another window (the main control view) so just
-    // draw the marker over the header itself, even if it makes it not very
-    // useful
-    dc.SetPen(*wxLIGHT_GREY_PEN);
-    dc.DrawLine(xPhysical, 0, xPhysical, GetClientSize().y);
-}
-

 void wxHeaderCtrl::EndDragging()
 {
 void wxHeaderCtrl::EndDragging()
 {

-    ClearMarkers();
-
-    m_overlay.Reset();
+    // We currently only use markers for reordering, not for resizing
+    if (IsReordering())
+    {
+        ClearMarkers();
+        m_overlay.Reset();
+    }

 
     // don't use the special dragging cursor any more
     SetCursor(wxNullCursor);
 
     // don't use the special dragging cursor any more
     SetCursor(wxNullCursor);


@@ -344,8 +332,6 @@ void wxHeaderCtrl::StartOrContinueResizing(unsigned int col, int xPhysical)
         }
         //else: we had already done the above when we started
 
         }
         //else: we had already done the above when we started
 

-        // This results in ugly flicker
-        // UpdateResizingMarker(xPhysical);

     }
 }
 
     }
 }