fixed dragging scrollbar in wxUniv: use wxMouseEvent::Dragging(), not Moving(), for...

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

diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp
index 8e52a895f43465f9ef9d8a0af8154de29b9065e7..793efab2fe6bb38b034e81d409ffa5dfc0d49b87 100644 (file)
--- 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 4fe391f0881a04ffcf976631010afc7ddb8b44fe..752ad21584f257a717cc7b07e1cc45b4b659a730 100644 (file)
--- 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
                                    (