From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 3 Nov 2010 16:29:36 +0000 (+0000)
Subject: Set column field of wxDVC ITEM_{ACTIVATED,CONTEXT_MENU} events.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ca81b52e62e67e75bf65eba59469484ea8886dfb?ds=inline

Set column field of wxDVC ITEM_{ACTIVATED,CONTEXT_MENU} events.

Add missing calls to wxDataViewEvent::SetColumn() and SetDataViewColumn().

In the future it would be nice to refactor the code to have a common event
object initialization function that would make it impossible to forget to do
this.

Closes #12649.

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index babb972b29..df22e987ea 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3623,6 +3623,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                 wxWindow *parent = GetParent();
                 wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
                 le.SetItem( item );
+                le.SetColumn( col->GetModelColumn() );
+                le.SetDataViewColumn( col );
                 le.SetEventObject(parent);
                 le.SetModel(GetOwner()->GetModel());
 
@@ -3693,6 +3695,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         wxWindow *parent = GetParent();
         wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId());
         le.SetItem( item );
+        le.SetColumn( col->GetModelColumn() );
+        le.SetDataViewColumn( col );
         le.SetEventObject(parent);
         le.SetModel(GetOwner()->GetModel());
         le.SetValue(value);