Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Václav Slavík
2010-03-28 14:37:30 +00:00
parent e9c4f54ef3
commit d4a58a7ce5
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/generic/scrlwing.cpp
View File

@@ -298,7 +298,6 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
} }
} }
if ( processed )
event.Skip(wasSkipped); event.Skip(wasSkipped);
return processed; return processed;

5
src/generic/vscroll.cpp
View File

@@ -97,10 +97,6 @@ bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
if ( wasSkipped ) if ( wasSkipped )
event.Skip(false); 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 || if ( evType == wxEVT_SCROLLWIN_TOP ||
evType == wxEVT_SCROLLWIN_BOTTOM || evType == wxEVT_SCROLLWIN_BOTTOM ||
evType == wxEVT_SCROLLWIN_LINEUP || evType == wxEVT_SCROLLWIN_LINEUP ||
@@ -127,7 +123,6 @@ bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
} }
#endif // wxUSE_MOUSEWHEEL #endif // wxUSE_MOUSEWHEEL
if ( processed )
event.Skip(wasSkipped); event.Skip(wasSkipped);
return processed; return processed;