Correct activate logic for mouse clicks

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 814de1999a14f3573153bc496bf5a1aa24d4f882..07574035b5a627a0ba98a0d89f63c9f4f377b02a 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3459,12 +3459,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
                                   col->GetWidth(), m_lineHeight );
                 cell->Activate( cell_rect, model, item, col->GetModelColumn() );
 
+            }
+            else
+            {
                 wxWindow *parent = GetParent();
                 wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
-
+                le.SetItem( GetItemByRow(current) );
                 le.SetEventObject(parent);
-                le.SetColumn(col->GetModelColumn());
-                le.SetDataViewColumn(col);
                 le.SetModel(GetOwner()->GetModel());
 
                 parent->GetEventHandler()->ProcessEvent(le);
@@ -3704,7 +3705,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
         sizer->Add( m_headerArea, 0, wxGROW );
     sizer->Add( m_clientArea, 1, wxGROW );
     SetSizer( sizer );
-
+    
     return true;
 }