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
This commit is contained in:
Vadim Zeitlin
2007-07-09 14:58:44 +00:00
parent 21dffed2f6
commit 0a904ed2c8
2 changed files with 8 additions and 6 deletions

View File

@@ -204,6 +204,7 @@ wxGTK:
- Speed up wxBitmap::Rescale() - Speed up wxBitmap::Rescale()
- Add right button event for wxToolbar's tools (Tim Kosse) - Add right button event for wxToolbar's tools (Tim Kosse)
- Don't unconditionally add wxCAPTION style to wxMiniFrame - 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 2.8.4

View File

@@ -2160,15 +2160,16 @@ bool wxListTextCtrlWrapper::AcceptChanges()
{ {
const wxString value = m_text->GetValue(); const wxString value = m_text->GetValue();
if ( value == m_startValue ) // notice that we should always call OnRenameAccept() to generate the "end
// nothing changed, always accept // label editing" event, even if the user hasn't really changed anything
return true;
if ( !m_owner->OnRenameAccept(m_itemEdited, value) ) if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
{
// vetoed by the user // vetoed by the user
return false; return false;
}
// accepted, do rename the item // accepted, do rename the item (unless nothing changed)
if ( value != m_startValue )
m_owner->SetItemText(m_itemEdited, value); m_owner->SetItemText(m_itemEdited, value);
return true; return true;