Fix the fix for not sending two end label edit events
because that fix prevented anyone from finishing the edit by keys. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2147,7 +2147,7 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
|
|||||||
|
|
||||||
void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
|
void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
|
||||||
{
|
{
|
||||||
if ( !m_finished )
|
if ( !m_finished && !m_aboutToFinish )
|
||||||
{
|
{
|
||||||
// We must finish regardless of success, otherwise we'll get
|
// We must finish regardless of success, otherwise we'll get
|
||||||
// focus problems:
|
// focus problems:
|
||||||
|
@@ -415,7 +415,7 @@ bool wxTreeTextCtrl::AcceptChanges()
|
|||||||
|
|
||||||
void wxTreeTextCtrl::Finish()
|
void wxTreeTextCtrl::Finish()
|
||||||
{
|
{
|
||||||
if ( !m_finished && !m_aboutToFinish )
|
if ( !m_finished )
|
||||||
{
|
{
|
||||||
m_owner->ResetTextControl();
|
m_owner->ResetTextControl();
|
||||||
|
|
||||||
@@ -470,7 +470,7 @@ void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event )
|
|||||||
|
|
||||||
void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event )
|
void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event )
|
||||||
{
|
{
|
||||||
if ( !m_finished )
|
if ( !m_finished && !m_aboutToFinish )
|
||||||
{
|
{
|
||||||
// We must finish regardless of success, otherwise we'll get
|
// We must finish regardless of success, otherwise we'll get
|
||||||
// focus problems:
|
// focus problems:
|
||||||
|
Reference in New Issue
Block a user