don't take EVT_HEADER_END_DRAG into account if it indicates the the drag was cancelled

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 3091a3adcab44d1186181f32f980c584f4cd0d98..af1c5ee2752886466fa3eb4a77225b7a0fb6e2d7 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -154,9 +154,12 @@ private:
 
     void OnEndDrag(wxHeaderCtrlEvent& event)
     {
-        const unsigned col = event.GetColumn();
-        GetColumn(col).SetWidth(event.GetWidth());
-        GetOwner()->OnColumnChange(col);
+        if ( !event.IsCancelled() )
+        {
+            const unsigned col = event.GetColumn();
+            GetColumn(col).SetWidth(event.GetWidth());
+            GetOwner()->OnColumnChange(col);
+        }
     }
 
     DECLARE_EVENT_TABLE()