diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/widgets/widgets/qscrollbar.cpp | 20 | ||||
-rw-r--r-- | src/widgets/widgets/qscrollbar.h | 3 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index efb17afedb..9ef56b7f95 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -476,8 +476,18 @@ bool QScrollBar::event(QEvent *event) if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event)) d_func()->updateHoverControl(he->pos()); break; + default: + break; + } + return QAbstractSlider::event(event); +} + +/*! + \reimp +*/ #ifndef QT_NO_WHEELEVENT - case QEvent::Wheel: { +void QScrollBar::wheelEvent(QWheelEvent *event) +{ event->ignore(); // override wheel event without adding virtual function override QWheelEvent *ev = static_cast<QWheelEvent *>(event); @@ -492,14 +502,8 @@ bool QScrollBar::event(QEvent *event) Q_D(QScrollBar); if (d->scrollByDelta(ev->orientation(), ev->modifiers(), delta)) event->accept(); - return true; - } -#endif - default: - break; - } - return QAbstractSlider::event(event); } +#endif /*! \reimp diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index 95943f2676..48863616ff 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -67,6 +67,9 @@ public: bool event(QEvent *event); protected: +#ifndef QT_NO_WHEELEVENT + void wheelEvent(QWheelEvent *); +#endif void paintEvent(QPaintEvent *); void mousePressEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *); |