2006-10-29 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD --> generics for 2006/10/04-2006/10/29.

1 files changed, 5 insertions, 3 deletions

diff --git a/javax/swing/JScrollPane.java b/javax/swing/JScrollPane.java
index 45df1d919..f6d37c7b4 100644
--- a/javax/swing/JScrollPane.java
+++ b/javax/swing/JScrollPane.java
@@ -161,9 +161,10 @@ public class JScrollPane extends JComponent
   protected int verticalScrollBarPolicy;
 
   protected JViewport viewport;
-  
-  Border viewportBorder;
-  boolean wheelScrollingEnabled;
+
+  private Border viewportBorder;
+
+  private boolean wheelScrollingEnabled;
 
   public JViewport getColumnHeader()
   {
@@ -595,6 +596,7 @@ public class JScrollPane extends JComponent
    */
   public JScrollPane(Component view, int vsbPolicy, int hsbPolicy) 
   {
+    wheelScrollingEnabled = true;
     setVerticalScrollBarPolicy(vsbPolicy);
     setVerticalScrollBar(createVerticalScrollBar());
     setHorizontalScrollBarPolicy(hsbPolicy);