[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[gramps]

The following commit has been merged in the debian/unstable branch:
commit a9e61c8d19783910a97f5f485e63c22aba984b85
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 4 23:49:01 2001 +0000

    Now inherit from QFrame, added scrollbar support
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index b89b035..b1a891c 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -26,11 +26,12 @@
 #ifndef QSCROLLVIEW_H_
 #define QSCROLLVIEW_H_
 
-#include "qwidget.h"
+#include "qframe.h"
 #include "qscrollbar.h"
 
-class QScrollView : public QWidget {
+class QScrollView : public QFrame {
 public:
+    QScrollView();
     QWidget* viewport() const;
     int visibleWidth() const;
     int visibleHeight() const;
@@ -42,6 +43,8 @@ public:
     enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
     QScrollBar *horizontalScrollBar() const;
     QScrollBar *verticalScrollBar() const;
+    virtual void setVScrollBarMode(ScrollBarMode);
+    virtual void setHScrollBarMode(ScrollBarMode);
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index b89b035..b1a891c 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -26,11 +26,12 @@
 #ifndef QSCROLLVIEW_H_
 #define QSCROLLVIEW_H_
 
-#include "qwidget.h"
+#include "qframe.h"
 #include "qscrollbar.h"
 
-class QScrollView : public QWidget {
+class QScrollView : public QFrame {
 public:
+    QScrollView();
     QWidget* viewport() const;
     int visibleWidth() const;
     int visibleHeight() const;
@@ -42,6 +43,8 @@ public:
     enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
     QScrollBar *horizontalScrollBar() const;
     QScrollBar *verticalScrollBar() const;
+    virtual void setVScrollBarMode(ScrollBarMode);
+    virtual void setHScrollBarMode(ScrollBarMode);
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qscrollview.h b/WebCore/src/kwq/qt/qscrollview.h
index b89b035..b1a891c 100644
--- a/WebCore/src/kwq/qt/qscrollview.h
+++ b/WebCore/src/kwq/qt/qscrollview.h
@@ -26,11 +26,12 @@
 #ifndef QSCROLLVIEW_H_
 #define QSCROLLVIEW_H_
 
-#include "qwidget.h"
+#include "qframe.h"
 #include "qscrollbar.h"
 
-class QScrollView : public QWidget {
+class QScrollView : public QFrame {
 public:
+    QScrollView();
     QWidget* viewport() const;
     int visibleWidth() const;
     int visibleHeight() const;
@@ -42,6 +43,8 @@ public:
     enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
     QScrollBar *horizontalScrollBar() const;
     QScrollBar *verticalScrollBar() const;
+    virtual void setVScrollBarMode(ScrollBarMode);
+    virtual void setHScrollBarMode(ScrollBarMode);
 };
 
 #endif

-- 
WebKit Debian packaging