diff --git a/docs/changes.txt b/docs/changes.txt index f229181029..f255964d9d 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -135,6 +135,7 @@ wxGTK: - Fix not showing wxInfoBar with GTK+ 3 < 3.22.29. - Fix the build with glib < 2.32 (e.g. CentOS 6). - Fix field widths in wxStatusBar showing a size grip. +- Fill column value in wxEVT_DATAVIEW_ITEM_ACTIVATED events. wxMSW: diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 852be2f15f..51273a6106 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -1214,7 +1214,8 @@ void MyFrame::OnValueChanged( wxDataViewEvent &event ) void MyFrame::OnActivated( wxDataViewEvent &event ) { wxString title = m_music_model->GetTitle( event.GetItem() ); - wxLogMessage( "wxEVT_DATAVIEW_ITEM_ACTIVATED, Item: %s", title ); + wxLogMessage( "wxEVT_DATAVIEW_ITEM_ACTIVATED, Item: %s; Column: %d", + title, event.GetColumn() ); if (m_ctrl[0]->IsExpanded( event.GetItem() )) { diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index b0ab353be1..8e1a6503a3 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -4461,10 +4461,11 @@ wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wx static void wxdataview_row_activated_callback( GtkTreeView* WXUNUSED(treeview), GtkTreePath *path, - GtkTreeViewColumn *WXUNUSED(column), wxDataViewCtrl *dv ) + GtkTreeViewColumn *column, wxDataViewCtrl *dv ) { wxDataViewItem item(dv->GTKPathToItem(path)); - wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_ACTIVATED, dv, item); + wxDataViewEvent + event(wxEVT_DATAVIEW_ITEM_ACTIVATED, dv, dv->GTKColumnToWX(column), item); dv->HandleWindowEvent( event ); }