removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy.

Thu Nov  5 16:00:32 1998  Lars Hamann  <lars@gtk.org>

	* gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar,
 	vscrollbar_policy, hscrollbar_policy. added h/vadjustment.

	* gtk/gtkclist.c (gtk_clist_class_init): added new args types
  	"hadjustment" & "vadjustment"
 	 (gtk_clist_set_arg) (gtk_clist_get_arg): new object class
  	set/get_arg functions
 	(gtk_clist_construct): don't create/adjust scrollbars.
 	(gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions
 	to set h/vadjustments
  	(gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions
 	to query h/vadjustments
 	(create_scrollbars): removed.
 	(create_adjustments): replacement for create_scrollbars
 	(gtk_clist_new): call gtk_clist_new_with_titles
 	(gtk_clist_new_with_titles): don't warn on titles == NULL
 	(move_horizontal): use CLAMP instead
 	(gtk_clist_set_policy): deprecated method.
  	use gtk_scrolled_window_set_policy instead.
 	(vadjustment_value_changed): use clist->vadj.
 	(adjust_scrollbars): renamed to adjust_adjustments
 	(adjust_adjustments): former adjust_scrollbars
 	(gtk_clist_destroy): unref adjustments
 	(gtk_clist_size_allocate) (gtk_clist_map) (title_focus)
  	(gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus)
  	(gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars
 	(gtk_clist_thaw) (real_insert_row) (real_remove_row)
 	(gtk_clist_set_row_height) (real_resize_column):
 	call adjust_adjustments
 	(gtk_clist_moveto): return if clist has no adjustments yet.
 	(gtk_clist_parent_set): new GtkWidget::parent_set function.
 	Autogenerate h/vadjustments if needed.
 	(move_horizontal) (move_vertical): some cleanups

	* gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new):
  	call only gtk_viewport_set_h/vadjustment and let these functions
  	do the work.
 	(gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment):
 	generate a new adjustment if needed

	* gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow):
  	use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible

	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed):
  	queue_resize if visibility of scrollbars changes
  	(gtk_scrolled_window_remove): only call container_remove with
  	scrolled_window->viewport automatically if viewport was autogenerated
 	(gtk_scrolled_window_add): add widget as scrolled_window->viewport.
 	auto create a viewport only if widget does not take h/vadjustments.
 	(gtk_scrolled_window_construct): don't generate a viewport
  	automatically.
 	(gtk_scrolled_window_forall): call callback with viewport in any case
 	(gtk_scrolled_window_set_arg): call gtk_container_add in case of
  	ARG_VIEWPORT
 	(gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request)
 	(gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check
  	viewport != NULL

	* gtk/testgtk.c
 	(create_ctree) (export_ctree) (create_clist): use a scrolled_window
  	in conjunction with clists/ctrees

	* gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window
 	in conjunction with clists

	* gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window
 	in conjunction with clists

1 files changed, 36 insertions, 17 deletions

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 600b8e8850..7c664306e5 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -81,6 +81,7 @@
 #include "gtksignal.h"
 #include "gtktable.h"
 #include "gtkvbox.h"
+#include "gtkscrolledwindow.h"
 
 /* The maximum number of fontnames requested with XListFonts(). */
 #define MAX_FONTS 32767
@@ -431,6 +432,7 @@ gtk_font_selection_class_init(GtkFontSelectionClass *klass)
 static void
 gtk_font_selection_init(GtkFontSelection *fontsel)
 {
+  GtkWidget *scrolled_win;
   GtkWidget *text_frame;
   GtkWidget *text_box, *frame;
   GtkWidget *table, *label, *hbox, *hbox2, *clist, *button, *vbox, *alignment;
@@ -524,33 +526,43 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
   fontsel->font_clist = gtk_clist_new(1);
   gtk_clist_column_titles_hide (GTK_CLIST(fontsel->font_clist));
   gtk_clist_set_column_width (GTK_CLIST(fontsel->font_clist), 0, 300);
-  gtk_clist_set_policy(GTK_CLIST(fontsel->font_clist), GTK_POLICY_ALWAYS,
-		       GTK_POLICY_AUTOMATIC);
   gtk_widget_set_usize (fontsel->font_clist, FONT_LIST_WIDTH,
 			FONT_LIST_HEIGHT);
+  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_container_add (GTK_CONTAINER (scrolled_win), fontsel->font_clist);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+				  GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
   gtk_widget_show(fontsel->font_clist);
-  gtk_table_attach (GTK_TABLE (table), fontsel->font_clist, 0, 1, 2, 3,
+  gtk_widget_show(scrolled_win);
+
+  gtk_table_attach (GTK_TABLE (table), scrolled_win, 0, 1, 2, 3,
 		    GTK_EXPAND | GTK_FILL,
 		    GTK_EXPAND | GTK_FILL, 0, 0);
   
   fontsel->font_style_clist = gtk_clist_new(1);
   gtk_clist_column_titles_hide (GTK_CLIST(fontsel->font_style_clist));
   gtk_clist_set_column_width (GTK_CLIST(fontsel->font_style_clist), 0, 300);
-  gtk_clist_set_policy(GTK_CLIST(fontsel->font_style_clist), GTK_POLICY_ALWAYS,
-		       GTK_POLICY_AUTOMATIC);
   gtk_widget_set_usize (fontsel->font_style_clist, FONT_STYLE_LIST_WIDTH, -1);
+  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_container_add (GTK_CONTAINER (scrolled_win), fontsel->font_style_clist);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+				  GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
   gtk_widget_show(fontsel->font_style_clist);
-  gtk_table_attach (GTK_TABLE (table), fontsel->font_style_clist, 1, 2, 2, 3,
+  gtk_widget_show(scrolled_win);
+  gtk_table_attach (GTK_TABLE (table), scrolled_win, 1, 2, 2, 3,
 		    GTK_EXPAND | GTK_FILL,
 		    GTK_EXPAND | GTK_FILL, 0, 0);
   
   fontsel->size_clist = gtk_clist_new(1);
   gtk_clist_column_titles_hide (GTK_CLIST(fontsel->size_clist));
-  gtk_clist_set_policy(GTK_CLIST(fontsel->size_clist), GTK_POLICY_ALWAYS,
-		       GTK_POLICY_AUTOMATIC);
   gtk_widget_set_usize (fontsel->size_clist, FONT_SIZE_LIST_WIDTH, -1);
+  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_container_add (GTK_CONTAINER (scrolled_win), fontsel->size_clist);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+				  GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
   gtk_widget_show(fontsel->size_clist);
-  gtk_table_attach (GTK_TABLE (table), fontsel->size_clist, 2, 3, 2, 3,
+  gtk_widget_show(scrolled_win);
+  gtk_table_attach (GTK_TABLE (table), scrolled_win, 2, 3, 2, 3,
 		    GTK_FILL, GTK_FILL, 0, 0);
   
   
@@ -683,16 +695,19 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
   gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
 			    fontsel->info_vbox, label);
   
-  fontsel->info_clist = gtk_clist_new_with_titles(3, titles);
+  fontsel->info_clist = gtk_clist_new_with_titles (3, titles);
   gtk_widget_set_usize (fontsel->info_clist, 390, 150);
   gtk_clist_set_column_width(GTK_CLIST(fontsel->info_clist), 0, 130);
   gtk_clist_set_column_width(GTK_CLIST(fontsel->info_clist), 1, 130);
   gtk_clist_set_column_width(GTK_CLIST(fontsel->info_clist), 2, 130);
   gtk_clist_column_titles_passive(GTK_CLIST(fontsel->info_clist));
-  gtk_clist_set_policy(GTK_CLIST(fontsel->info_clist), GTK_POLICY_AUTOMATIC,
-		       GTK_POLICY_AUTOMATIC);
+  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_container_add (GTK_CONTAINER (scrolled_win), fontsel->info_clist);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+				  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_widget_show(fontsel->info_clist);
-  gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), fontsel->info_clist,
+  gtk_widget_show(scrolled_win);
+  gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), scrolled_win,
 		      TRUE, TRUE, 0);
   
   /* Insert the property names */
@@ -806,9 +821,13 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
       gtk_widget_set_usize (clist, 100, filter_heights[prop]);
       gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_MULTIPLE);
       gtk_clist_column_titles_hide(GTK_CLIST(clist));
-      gtk_clist_set_policy(GTK_CLIST(clist), GTK_POLICY_AUTOMATIC,
-			   GTK_POLICY_AUTOMATIC);
+      scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+      gtk_container_add (GTK_CONTAINER (scrolled_win), clist);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+				      GTK_POLICY_AUTOMATIC,
+				      GTK_POLICY_AUTOMATIC);
       gtk_widget_show(clist);
+      gtk_widget_show(scrolled_win);
       
       /* For the bottom-right cell we add the 'Reset Filter' button. */
       if (top == 2 && left == 2)
@@ -818,7 +837,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
 	  gtk_table_attach (GTK_TABLE (table), vbox, left, left + 1,
 			    top + 1, top + 2, GTK_FILL, GTK_FILL, 0, 0);
 	  
-	  gtk_box_pack_start (GTK_BOX (vbox), clist, TRUE, TRUE, 0);
+	  gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE, TRUE, 0);
 	  
 	  alignment = gtk_alignment_new(0.5, 0.0, 0.8, 0.0);
 	  gtk_widget_show(alignment);
@@ -832,7 +851,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
 			      fontsel);
 	}
       else
-	gtk_table_attach (GTK_TABLE (table), clist,
+	gtk_table_attach (GTK_TABLE (table), scrolled_win,
 			  left, left + 1, top + 1, top + 2,
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);