The tree only sets the focus in response to a TVN_SELCHANGINGW event if the tree...

TVN_SELCHANGINGW is generated when the tree items are deleted. Without this change, if a tree control is
in a dialog being closed, the newly active window will become inactive momentarily when tree items
are deleted and you will see a flicker.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 6cd893542d9a999e0b9a4815a971ab416293af2f..37d21463a4930ee671487d1e30541bba1b02243f 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -791,6 +791,8 @@ bool wxTreeCtrl::Create(wxWindow *parent,
 
 wxTreeCtrl::~wxTreeCtrl()
 {
 
 wxTreeCtrl::~wxTreeCtrl()
 {

+    m_isBeingDeleted = true;
+

     // delete any attributes
     if ( m_hasAnyAttr )
     {
     // delete any attributes
     if ( m_hasAnyAttr )
     {


@@ -3468,7 +3470,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             //
             // to avoid such surprises, we force the generation of focus events
             // now, before we generate the selection change ones
             //
             // to avoid such surprises, we force the generation of focus events
             // now, before we generate the selection change ones

-            if ( !m_changingSelection )
+            if ( !m_changingSelection && !m_isBeingDeleted )

                 SetFocus();
             break;
 
                 SetFocus();
             break;