don't allow resizing non-resizeable columns in wxHeaderCtrl itself, no need to do...

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index edf9429ba4fcf9f12769c5096741664d4472d57e..2cda56e24c5f66321cbc3604116ff73a7c5c02c2 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -137,12 +137,6 @@ private:
             event.Skip();
     }
 
-    void OnBeginResize(wxHeaderCtrlEvent& event)
-    {
-        if ( !GetColumn(event.GetColumn()).IsResizeable() )
-            event.Veto();
-    }
-
     void OnEndResize(wxHeaderCtrlEvent& event)
     {
         if ( !event.IsCancelled() )
@@ -161,7 +155,6 @@ BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
     EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick)
     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick)
 
-    EVT_HEADER_BEGIN_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnBeginResize)
     EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnEndResize)
 END_EVENT_TABLE()
 

diff --git a/src/msw/headerctrl.cpp b/src/msw/headerctrl.cpp
index 463ef53132463b08534d17b9baf62952692ec1f7..d7206e12ff388fff1fec75683c1609adf55b9299 100644 (file)
--- a/src/msw/headerctrl.cpp
+++ b/src/msw/headerctrl.cpp
@@ -333,6 +333,15 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         // ASCII and Unicode versions of this message
         case HDN_BEGINTRACKA:
         case HDN_BEGINTRACKW:
+            // non-resizeable columns can't be resized no matter what, don't
+            // even generate any events for them
+            if ( !GetColumn(idx).IsResizeable() )
+            {
+                *result = TRUE;
+
+                return true;
+            }
+
             evtType = wxEVT_COMMAND_HEADER_BEGIN_RESIZE;
             // fall through