Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-23 06:33:59 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Remove notifier from the old model in generic wxDataViewCtrl

Browse Source 
Failure to do so could result in a crash later if the old model was not
destroyed but continued to exist independently of the control.

This also makes the code more natural and removes the need for the
comment explaining why we reset the notifier if we don't have any model.

Closes #25686.
This commit is contained in:
Vadim Zeitlin
2025-08-18 23:54:10 +02:00
parent 365b07b75f
commit 0aefcd7e9b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generic/datavgen.cpp
+8 -8
View File
@@ -5889,6 +5889,14 @@ bool wxDataViewCtrl::Enable(bool enable)
bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
{
if (wxDataViewModel* const oldModel = GetModel())
{
// Remove the notifier from the model before calling the base class
// version which may (or not) delete the model.
oldModel->RemoveNotifier( m_notifier );
m_notifier = nullptr;
}
if (!wxDataViewCtrlBase::AssociateModel( model ))
return false;
@@ -5897,14 +5905,6 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
model->AddNotifier( m_notifier );
}
else
{
// Our previous notifier has either been already deleted when the
// previous model was DecRef()'d in the base class AssociateModel() or
// is not associated with us any more because if the model is still
// alive, it's not used by this control.
m_notifier = nullptr;
}
m_clientArea->DestroyTree();