merging owen's bug fix

Fri May  1 22:45:55 1998  Owen Taylor  <otaylor@gtk.org>

        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate):
                Always show the scrollbars when the policy is
                        GTK_POLICY_ALWAYS...

ChangeLog

+Fri May  1 22:45:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate):
+        Always show the scrollbars when the policy is
+        GTK_POLICY_ALWAYS...
+
 Sat May  2 20:19:03 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit

ChangeLog.pre-2-0

+Fri May  1 22:45:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate):
+        Always show the scrollbars when the policy is
+        GTK_POLICY_ALWAYS...
+
 Sat May  2 20:19:03 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit

ChangeLog.pre-2-10

+Fri May  1 22:45:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate):
+        Always show the scrollbars when the policy is
+        GTK_POLICY_ALWAYS...
+
 Sat May  2 20:19:03 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit

ChangeLog.pre-2-2

+Fri May  1 22:45:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate):
+        Always show the scrollbars when the policy is
+        GTK_POLICY_ALWAYS...
+
 Sat May  2 20:19:03 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit

ChangeLog.pre-2-4

+Fri May  1 22:45:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate):
+        Always show the scrollbars when the policy is
+        GTK_POLICY_ALWAYS...
+
 Sat May  2 20:19:03 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit

ChangeLog.pre-2-6

+Fri May  1 22:45:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate):
+        Always show the scrollbars when the policy is
+        GTK_POLICY_ALWAYS...
+
 Sat May  2 20:19:03 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit

ChangeLog.pre-2-8

+Fri May  1 22:45:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate):
+        Always show the scrollbars when the policy is
+        GTK_POLICY_ALWAYS...
+
 Sat May  2 20:19:03 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit

gtk/gtkscrolledwindow.c

@@ -382,6 +382,11 @@ gtk_scrolled_window_size_allocate (GtkWidget     *widget,
 
   gtk_container_disable_resize (GTK_CONTAINER (scrolled_window));
 
+  if (scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS)
+    scrolled_window->hscrollbar_visible = TRUE;
+  if (scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS)
+    scrolled_window->vscrollbar_visible = TRUE;
+
   if (GTK_WIDGET_VISIBLE (scrolled_window->viewport))
     {
       count = 0;