RemoveEventHandler() didn't reset all pointers correctly (patch 819545)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 7cece1bb7a498274e44fa3c7e0e4e67c5db89c1c..76829f19d7f5dfd49e72deef8612319f1622873e 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -85,6 +85,7 @@ All (GUI):
 - wxListCtrl now sends an END_LABEL event if editing was cancelled, too
 - bug in wxRect ctor from two [out of order] wxPoints fixed (Steve Cornett)
 - status text is now restored after wxMenu help is shown in it
 - wxListCtrl now sends an END_LABEL event if editing was cancelled, too
 - bug in wxRect ctor from two [out of order] wxPoints fixed (Steve Cornett)
 - status text is now restored after wxMenu help is shown in it

+- bug in wxWindow::RemoveEventHandler() fixed (Yingjun Zhang)

 
 wxMSW:
 
 
 wxMSW:
 

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index ecd50f67349052e78b91c38d127d4b8d64e5aa73..a45a930faeef994357bf3532f321da5ba7af7593 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -812,7 +812,9 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
             {
                 handlerNext->SetPreviousHandler ( handlerPrev );
             }
             {
                 handlerNext->SetPreviousHandler ( handlerPrev );
             }

+

             handler->SetNextHandler(NULL);
             handler->SetNextHandler(NULL);

+            handler->SetPreviousHandler(NULL);

 
             return TRUE;
         }
 
             return TRUE;
         }