X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a268018748c6efb9f51254fb987c119afd71bdd..94e2ed3b8db0220160c0b939782cd46914ec073a:/src/generic/scrlwing.cpp?ds=sidebyside

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 862172c559..ce07d296b2 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -168,16 +168,15 @@ void wxAutoScrollTimer::Notify()
 bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
 {
     wxEventType evType = event.GetEventType();
-    
-    if ( evType == wxEVT_SIZE )  // Don't let wxPanel catch the size events. RR.
+
+    if ( evType == wxEVT_SIZE )
     {
         m_scrollHelper->HandleOnSize((wxSizeEvent &)event);
-        return TRUE;
     }
-    
+
     if ( wxEvtHandler::ProcessEvent(event) )
         return TRUE;
-        
+
     // reset the skipped flag to FALSE as it might have been set to TRUE in
     // ProcessEvent() above
     event.Skip(FALSE);
@@ -274,6 +273,8 @@ wxScrollHelper::~wxScrollHelper()
 
     if ( m_targetWindow )
         m_targetWindow->PopEventHandler(TRUE /* do delete it */);
+    if ( m_win && m_win != m_targetWindow)
+        m_win->PopEventHandler(TRUE /* do delete it */);
 }
 
 // ----------------------------------------------------------------------------
@@ -359,7 +360,17 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
 void wxScrollHelper::SetTargetWindow( wxWindow *target )
 {
     wxASSERT_MSG( target, wxT("target window must not be NULL") );
+    // FIXME: There is a potential problem with this way of deleting
+    // event handlers, basically you can not be sure that you delete
+    // the event handler that was create by this wxScrollHelper.
+    // Remove the old event handler from the previous target scroll window.
+    if (m_targetWindow && m_targetWindow != m_win)
+        m_targetWindow->PopEventHandler(TRUE /* Delete old event handler*/);
     m_targetWindow = target;
+    // Install a new event handler, which will intercept the events we're
+    // interested in from the target scroll window.
+    if (m_targetWindow != m_win)
+        m_targetWindow->PushEventHandler(new wxScrollHelperEvtHandler(this));
 }
 
 wxWindow *wxScrollHelper::GetTargetWindow() const
@@ -979,9 +990,24 @@ void wxScrollHelper::HandleOnMouseWheel(wxMouseEvent& event)
     {
         lines *= event.GetLinesPerAction();
 
-        int vsx, vsy;
-        GetViewStart(&vsx, &vsy);
-        Scroll(-1, vsy - lines);
+        wxScrollWinEvent newEvent;
+
+        newEvent.SetPosition(0);
+        newEvent.SetOrientation(wxVERTICAL);
+        newEvent.m_eventObject = m_win;
+        if (lines > 0)
+            newEvent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+        else
+            newEvent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+
+        int times = abs(lines);
+        for (; times > 0; times --)
+            m_win->GetEventHandler()->ProcessEvent(newEvent);
+
+        /* Old Way */
+        // int vsx, vsy;
+        // GetViewStart(&vsx, &vsy);
+        // Scroll(-1, vsy - lines);
     }
 }