Apply all Qt3.3.8d patches

NOTE: This will *likely* break compilation of TQt4
Please wait a few days for fixes to be committed as needed!

1 files changed, 4 insertions, 1 deletions

diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp
index 49c5b4d9b..3ba7eec04 100644
--- a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp
+++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp
@@ -1553,6 +1553,9 @@ bool TQScrollView::eventFilter( TQObject *obj, TQEvent *e )
         case TQEvent::LayoutHint:
             d->autoRetqsizeHint(this);
             break;
+        case TQEvent::WindowActivate:
+        case TQEvent::WindowDeactivate:
+            return TRUE;
         default:
             break;
         }
@@ -1865,7 +1868,7 @@ void TQScrollView::viewportWheelEvent( TQWheelEvent* e )
        the event itself.
     */
     TQWheelEvent ce( viewportToContents(e->pos()),
-        e->globalPos(), e->delta(), e->state());
+        e->globalPos(), e->delta(), e->state(), e->orientation());
     contentsWheelEvent(&ce);
     if ( ce.isAccepted() )
         e->accept();