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
This commit is contained in:
@@ -80,7 +80,8 @@ void wxInputConsumer::OnMouse(wxMouseEvent& event)
|
|||||||
{
|
{
|
||||||
if ( m_inputHandler )
|
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) )
|
if ( m_inputHandler->HandleMouseMove(this, event) )
|
||||||
return;
|
return;
|
||||||
|
@@ -849,7 +849,7 @@ bool wxStdScrollBarInputHandler::HandleMouseMove(wxInputConsumer *consumer,
|
|||||||
|
|
||||||
if ( m_winCapture )
|
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
|
// make the thumb follow the mouse by keeping the same offset
|
||||||
// between the mouse position and the top/left of the thumb
|
// 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);
|
bool isArrow = scrollbar->GetArrows().HandleMouseMove(event);
|
||||||
|
|
||||||
if ( event.Moving() )
|
if ( event.Dragging() )
|
||||||
{
|
{
|
||||||
wxHitTest ht = m_renderer->HitTestScrollbar
|
wxHitTest ht = m_renderer->HitTestScrollbar
|
||||||
(
|
(
|
||||||
|
Reference in New Issue
Block a user