generate wxEVT_COMMAND_LIST_END_LABEL_EDIT event even if label didn't change [backport of rev 47265 from trunk]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-09 15:00:42 +00:00
parent 10c14670ec
commit 49266c6b45
2 changed files with 8 additions and 6 deletions

View File

@@ -131,6 +131,7 @@ wxGTK:
- Don't unconditionally add wxCAPTION style to wxMiniFrame.
- Fixed crash in file and dir pickers for GTK+ < 2.6 if compiled
with GTK+ >= 2.6.
- Generate wxEVT_COMMAND_LIST_END_LABEL_EDIT event even if label didn't change
wxMac:

View File

@@ -2160,15 +2160,16 @@ 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
// accepted, do rename the item (unless nothing changed)
if ( value != m_startValue )
m_owner->SetItemText(m_itemEdited, value);
return true;