From 0a904ed2c8e491f0a0e8c481ceaa15f8166d55c9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 9 Jul 2007 14:58:44 +0000 Subject: [PATCH] generate wxEVT_COMMAND_LIST_END_LABEL_EDIT event even if label didn't change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/generic/listctrl.cpp | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 6d003a0171..02fdd43994 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -204,6 +204,7 @@ wxGTK: - Speed up wxBitmap::Rescale() - Add right button event for wxToolbar's tools (Tim Kosse) - Don't unconditionally add wxCAPTION style to wxMiniFrame +- Generate wxEVT_COMMAND_LIST_END_LABEL_EDIT event even if label didn't change 2.8.4 diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 627f683f44..c0fe60314f 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -2160,16 +2160,17 @@ bool wxListTextCtrlWrapper::AcceptChanges() { const wxString value = m_text->GetValue(); - if ( value == m_startValue ) - // nothing changed, always accept - return true; - + // notice that we should always call OnRenameAccept() to generate the "end + // label editing" event, even if the user hasn't really changed anything if ( !m_owner->OnRenameAccept(m_itemEdited, value) ) + { // vetoed by the user return false; + } - // accepted, do rename the item - m_owner->SetItemText(m_itemEdited, value); + // accepted, do rename the item (unless nothing changed) + if ( value != m_startValue ) + m_owner->SetItemText(m_itemEdited, value); return true; } -- 2.45.2