From ca1ecff429d8e26aa604c802b1fce0fda6e8c188 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 20 Dec 2004 01:08:13 +0000 Subject: [PATCH] fixed dragging scrollbar in wxUniv: use wxMouseEvent::Dragging(), not Moving(), for tests (patch 1075176; bug 1053645) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/univ/inpcons.cpp | 3 ++- src/univ/scrolbar.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp index 8e52a895f4..793efab2fe 100644 --- a/src/univ/inpcons.cpp +++ b/src/univ/inpcons.cpp @@ -80,7 +80,8 @@ void wxInputConsumer::OnMouse(wxMouseEvent& event) { if ( m_inputHandler ) { - if ( event.Moving() || event.Entering() || event.Leaving() ) + if ( event.Moving() || event.Dragging() || + event.Entering() || event.Leaving() ) { if ( m_inputHandler->HandleMouseMove(this, event) ) return; diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp index 4fe391f088..752ad21584 100644 --- a/src/univ/scrolbar.cpp +++ b/src/univ/scrolbar.cpp @@ -849,7 +849,7 @@ bool wxStdScrollBarInputHandler::HandleMouseMove(wxInputConsumer *consumer, if ( m_winCapture ) { - if ( (m_htLast == wxHT_SCROLLBAR_THUMB) && event.Moving() ) + if ( (m_htLast == wxHT_SCROLLBAR_THUMB) && event.Dragging() ) { // make the thumb follow the mouse by keeping the same offset // between the mouse position and the top/left of the thumb @@ -864,7 +864,7 @@ bool wxStdScrollBarInputHandler::HandleMouseMove(wxInputConsumer *consumer, bool isArrow = scrollbar->GetArrows().HandleMouseMove(event); - if ( event.Moving() ) + if ( event.Dragging() ) { wxHitTest ht = m_renderer->HitTestScrollbar (