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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 00af196417..cf18c3bf8c 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;
     }
 }
 
@@ -1122,11 +1102,6 @@ bool wxGenericScrolledWindow::Create(wxWindow *parent,
 
     bool ok = wxPanel::Create(parent, id, pos, size, style, name);
 
-#ifdef __WXMSW__
-    // we need to process arrows ourselves for scrolling
-    m_lDlgCode |= DLGC_WANTARROWS;
-#endif // __WXMSW__
-
     return ok;
 }
 
@@ -1143,6 +1118,25 @@ void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
     event.Skip();
 }
 
+#ifdef __WXMSW__
+long
+wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg,
+                                       WXWPARAM wParam,
+                                       WXLPARAM lParam)
+{
+    long rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam);
+
+    // we need to process arrows ourselves for scrolling
+    if ( nMsg == WM_GETDLGCODE )
+    {
+        rc |= DLGC_WANTARROWS;
+    }
+
+    return rc;
+}
+
+#endif // __WXMSW__
+
 #if WXWIN_COMPATIBILITY
 
 void wxGenericScrolledWindow::GetScrollUnitsPerPage (int *x_page, int *y_page) const