From: Vadim Zeitlin Date: Fri, 17 May 2002 23:54:42 +0000 (+0000) Subject: made SetItemText() work for the item which we're about to start editing X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/44fbc477af80b3fe0be6052361734ad0d064d58d made SetItemText() work for the item which we're about to start editing git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 84a8b01c20..9a393feba7 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -891,6 +891,20 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) wxTreeViewItem tvItem(item, TVIF_TEXT); tvItem.pszText = (wxChar *)text.c_str(); // conversion is ok DoSetItem(&tvItem); + + // when setting the text of the item being edited, the text control should + // be updated to reflect the new text as well, otherwise calling + // SetItemText() in the OnBeginLabelEdit() handler doesn't have any effect + // + // don't use GetEditControl() here because m_textCtrl is not set yet + HWND hwndEdit = TreeView_GetEditControl(GetHwnd()); + if ( hwndEdit ) + { + if ( item == GetSelection() ) + { + ::SetWindowText(hwndEdit, text); + } + } } int wxTreeCtrl::DoGetItemImageFromData(const wxTreeItemId& item, @@ -1761,7 +1775,7 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId& item) } } -wxTextCtrl* wxTreeCtrl::GetEditControl() const +wxTextCtrl *wxTreeCtrl::GetEditControl() const { return m_textCtrl; }