diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index edf9429ba4..2cda56e24c 100644 --- 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 463ef53132..d7206e12ff 100644 --- 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