CVS commit by pfeiffer: ok, reverting it M +0 -12 qcheckbox.cpp 1.51 M +1 -1 qcheckbox.h 1.50 M +1 -9 qradiobutton.cpp 1.51 --- qt-copy/src/widgets/qcheckbox.cpp #1.50:1.51 @@ -346,15 +346,3 @@ void QCheckBox::updateMask() setMask(bm); } - -bool QCheckBox::hitButton( const QPoint &pos ) const -{ - QRect r = QStyle::visualRect( style().subRect( QStyle::SR_CheckBoxFocusRect, this ), this ); - if ( qApp->reverseLayout() ) { - r.setRight( width() ); - } else { - r.setLeft( 0 ); - } - return r.contains( pos ); -} - #endif --- qt-copy/src/widgets/qcheckbox.h #1.49:1.50 @@ -73,5 +73,5 @@ protected: void drawButtonLabel( QPainter * ); void updateMask(); - virtual bool hitButton( const QPoint &pos ) const; + private: // Disabled copy constructor and operator= #if defined(Q_DISABLE_COPY) --- qt-copy/src/widgets/qradiobutton.cpp #1.50:1.51 @@ -175,13 +175,5 @@ QSize QRadioButton::sizeHint() const bool QRadioButton::hitButton( const QPoint &pos ) const { - QRect r = - QStyle::visualRect( style().subRect( QStyle::SR_RadioButtonFocusRect, - this ), this ); - if ( qApp->reverseLayout() ) { - r.setRight( width() ); - } else { - r.setLeft( 0 ); - } - return r.contains( pos ); + return rect().contains( pos ); }