From afdec07df2673cf6ab450170570a129deb372834 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 19 Feb 2014 14:51:58 +0000 Subject: [PATCH] Set model pointer in wxDataViewEvents generated under wxOSX. Add missing SetModel() calls. Closes #16004. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/dataview_osx.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp index fd861deb39..3f88932a24 100644 --- a/src/osx/dataview_osx.cpp +++ b/src/osx/dataview_osx.cpp @@ -129,6 +129,7 @@ bool wxOSXDataViewModelNotifier::ItemChanged(wxDataViewItem const& item) wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId()); dataViewEvent.SetEventObject(m_DataViewCtrlPtr); + dataViewEvent.SetModel(m_DataViewCtrlPtr->GetModel()); dataViewEvent.SetItem(item); // sent the equivalent wxWidget event: m_DataViewCtrlPtr->HandleWindowEvent(dataViewEvent); @@ -150,6 +151,7 @@ bool wxOSXDataViewModelNotifier::ItemsChanged(wxDataViewItemArray const& items) dataViewEvent.SetEventObject(m_DataViewCtrlPtr); + dataViewEvent.SetModel(m_DataViewCtrlPtr->GetModel()); for (size_t indexItem=0; indexItemGetDataViewPeer()->Update(GetOwner()->GetParent(items[indexItem]),items[indexItem])) { @@ -215,6 +217,7 @@ bool wxOSXDataViewModelNotifier::ValueChanged(wxDataViewItem const& item, unsign wxDataViewEvent dataViewEvent(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId()); dataViewEvent.SetEventObject(m_DataViewCtrlPtr); + dataViewEvent.SetModel(m_DataViewCtrlPtr->GetModel()); dataViewEvent.SetColumn(col); dataViewEvent.SetItem(item); // send the equivalent wxWidget event: