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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 1957938d9c9f8a20e20abaaa72bd3366274d9bbd
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 1 18:36:57 2003 +0000

    	Fix for 3440804, broken scrollbars in downloads window.  Make Auto be the default
    	value in the enum, so that all scrollviews will be automatically initialized to be
    	auto.
    
    	Reviewed by cblu
    
            * kwq/KWQScrollView.h:
            * kwq/WebCoreFrameView.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5100 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4aefd7c..871cdc8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-10-01  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3440804, broken scrollbars in downloads window.  Make Auto be the default
+	value in the enum, so that all scrollviews will be automatically initialized to be
+	auto.
+
+	Reviewed by cblu
+
+        * kwq/KWQScrollView.h:
+        * kwq/WebCoreFrameView.h:
+
 2003-09-30  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4aefd7c..871cdc8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-10-01  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3440804, broken scrollbars in downloads window.  Make Auto be the default
+	value in the enum, so that all scrollviews will be automatically initialized to be
+	auto.
+
+	Reviewed by cblu
+
+        * kwq/KWQScrollView.h:
+        * kwq/WebCoreFrameView.h:
+
 2003-09-30  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index 3dfa1e7..87e7b5b 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -36,7 +36,7 @@ class NSView;
 
 class QScrollView : public QFrame {
 public:
-    enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+    enum ScrollBarMode { Auto, AlwaysOff, AlwaysOn };
 
     QScrollView(QWidget *parent = 0, const char *name = 0, int flags = 0) { }
 
diff --git a/WebCore/kwq/WebCoreFrameView.h b/WebCore/kwq/WebCoreFrameView.h
index d7c6737..fab3e2d 100644
--- a/WebCore/kwq/WebCoreFrameView.h
+++ b/WebCore/kwq/WebCoreFrameView.h
@@ -28,9 +28,9 @@
 // scroll view is resized.
 
 typedef enum {
+    WebCoreScrollBarAuto,
     WebCoreScrollBarAlwaysOff,
-    WebCoreScrollBarAlwaysOn,
-    WebCoreScrollBarAuto
+    WebCoreScrollBarAlwaysOn
 } WebCoreScrollBarMode;
 
 @protocol WebCoreFrameView

-- 
WebKit Debian packaging