From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 28 Mar 2010 14:37:30 +0000 (+0000)
Subject: Preserve m_skipped in wx[Var]ScrollHelperEvtHandler::ProcessEvent.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d4a58a7ce50dc06be27dbe5722a6d5761520cb6c

Preserve m_skipped in wx[Var]ScrollHelperEvtHandler::ProcessEvent.

If the event was skipped and not processed, its "skipped" status would
be lost.

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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index e8154d1559..6e0cca186f 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -298,8 +298,7 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
         }
     }
 
-    if ( processed )
-        event.Skip(wasSkipped);
+    event.Skip(wasSkipped);
 
     return processed;
 }
diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index 809ae48576..96fcd3f54d 100644
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -97,10 +97,6 @@ bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
     if ( wasSkipped )
         event.Skip(false);
 
-    // reset the skipped flag to false as it might have been set to true in
-    // ProcessEvent() above
-    event.Skip(false);
-
     if ( evType == wxEVT_SCROLLWIN_TOP ||
          evType == wxEVT_SCROLLWIN_BOTTOM ||
          evType == wxEVT_SCROLLWIN_LINEUP ||
@@ -127,8 +123,7 @@ bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
     }
 #endif // wxUSE_MOUSEWHEEL
 
-    if ( processed )
-        event.Skip(wasSkipped);
+    event.Skip(wasSkipped);
 
     return processed;
 }