Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

list ctrl and tree ctrl didn't like the new focus code,

Browse Source 
mem clean uop crash fixed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-02-15 18:38:19 +00:00
parent f87ac92e02
commit bce1406bff
7 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/generic/listctrl.cpp
View File

@@ -1060,24 +1060,33 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
{
(*m_accept) = TRUE;
(*m_res) = GetValue();
m_owner->SetFocus();
if (!wxPendingDelete.Member(this))
wxPendingDelete.Append(this);
if ((*m_accept) && ((*m_res) != m_startValue))
m_owner->OnRenameAccept();
return;
}
if (event.m_keyCode == WXK_ESCAPE)
{
(*m_accept) = FALSE;
(*m_res) = "";
m_owner->SetFocus();
if (!wxPendingDelete.Member(this))
wxPendingDelete.Append(this);
return;
}
event.Skip();
}
void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
{
if (wxPendingDelete.Member(this)) return;
wxPendingDelete.Append(this);
if (!wxPendingDelete.Member(this))
wxPendingDelete.Append(this);
if ((*m_accept) && ((*m_res) != m_startValue))
m_owner->OnRenameAccept();