From 6b236d5d7edd8e2ee30e75f9114f62376a88a47b Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Tue, 28 Apr 2015 20:55:17 +0200 Subject: [PATCH] Prevent sending wxEVT_PG_LABEL_EDIT_ENDING events recursively, cont. Spurious wxEVT_PG_LABEL_EDIT_ENDING events shouldn't be generated also if wxPropertyGrid::DoEndLabelEdit() function is reentered multiple times (constraint for selected column should be removed from the guard because column index is set to 1 after first reentry and no longer reflects original value stored in the event object). Closes #16864. --- src/propgrid/propgrid.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 5ca11bb28c..db7426912e 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -1051,8 +1051,7 @@ void wxPropertyGrid::DoEndLabelEdit( bool commit, int selFlags ) // for the same property and the same label. if ( m_processedEvent && m_processedEvent->GetEventType() == wxEVT_PG_LABEL_EDIT_ENDING && - m_processedEvent->GetProperty() == prop && - m_processedEvent->GetColumn() == m_selColumn) + m_processedEvent->GetProperty() == prop ) { return; }