X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/248d771ce4cb955541f411734ac461a6d15a40e4..497b78dfacb5e739fe7da7869f3a92a2e2747dbc:/src/generic/scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 00af196417..cf4792b5fc 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -392,34 +392,14 @@ void wxScrollHelper::DeleteEvtHandler()
     // search for m_handler in the handler list
     if ( m_win && m_handler )
     {
-        wxEvtHandler *handlerPrev = NULL,
-                     *handler = m_win->GetEventHandler();
-        while ( handler )
+        if ( m_win->RemoveEventHandler(m_handler) )
         {
-            if ( handler == m_handler )
-            {
-                wxEvtHandler *handlerNext = handler->GetNextHandler();
-                if ( handlerPrev )
-                {
-                    handlerPrev->SetNextHandler(handlerNext);
-                }
-                else
-                {
-                    m_win->SetEventHandler(handlerNext);
-                }
-
-                handler->SetNextHandler(NULL);
-                delete handler;
-                m_handler = NULL;
-
-                return;
-            }
-
-            handlerPrev = handler;
-            handler = handler->GetNextHandler();
+            delete m_handler;
         }
+        //else: something is very wrong, so better [maybe] leak memory than
+        //      risk a crash because of double deletion
 
-        wxFAIL_MSG( _T("where has our event handler gone?") );
+        m_handler = NULL;
     }
 }