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, 24 insertions, 17 deletions

diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index bbc23c762d..3f20066a12 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -156,10 +156,8 @@ struct _GtkCList
   gint undo_anchor;
   
   /* scrollbars */
-  GtkWidget *vscrollbar;
-  GtkWidget *hscrollbar;
-  guint8 vscrollbar_policy;
-  guint8 hscrollbar_policy;
+  GtkAdjustment *hadjustment;
+  GtkAdjustment *vadjustment;
   
   /* xor GC for the vertical drag line */
   GdkGC *xor_gc;
@@ -384,13 +382,19 @@ void gtk_clist_construct (GtkCList *clist,
 			  gchar    *titles[]);
 
 /* create a new GtkCList */
-GtkWidget *gtk_clist_new             (gint   columns);
-GtkWidget *gtk_clist_new_with_titles (gint   columns,
+GtkWidget* gtk_clist_new             (gint   columns);
+GtkWidget* gtk_clist_new_with_titles (gint   columns,
 				      gchar *titles[]);
 
-/* deprecated function, use gtk_clist_set_shadow_type instead. */
-void gtk_clist_set_border (GtkCList      *clist,
-			   GtkShadowType  border);
+/* set adjustments of clist */
+void gtk_clist_set_hadjustment (GtkCList      *clist,
+				GtkAdjustment *adjustment);
+void gtk_clist_set_vadjustment (GtkCList      *clist,
+				GtkAdjustment *adjustment);
+
+/* get adjustments of clist */
+GtkAdjustment* gtk_clist_get_hadjustment (GtkCList *clist);
+GtkAdjustment* gtk_clist_get_vadjustment (GtkCList *clist);
 
 /* set the border style of the clist */
 void gtk_clist_set_shadow_type (GtkCList      *clist,
@@ -400,14 +404,6 @@ void gtk_clist_set_shadow_type (GtkCList      *clist,
 void gtk_clist_set_selection_mode (GtkCList         *clist,
 				   GtkSelectionMode  mode);
 
-/* set policy on the scrollbar, to either show them all the time
- * or show them only when they are needed, ie., when there is more
- * than one page of information
- */
-void gtk_clist_set_policy (GtkCList      *clist,
-			   GtkPolicyType  vscrollbar_policy,
-			   GtkPolicyType  hscrollbar_policy);
-
 /* freeze all visual updates of the list, and then thaw the list after
  * you have made a number of changes and the updates wil occure in a
  * more efficent mannor than if you made them on a unfrozen list
@@ -696,6 +692,17 @@ void gtk_clist_sort (GtkCList *clist);
 void gtk_clist_set_auto_sort (GtkCList *clist,
 			      gboolean  auto_sort);
 
+
+/* Deprecated methods */
+
+/* Use gtk_clist_set_shadow_type instead. */
+void gtk_clist_set_border (GtkCList      *clist,
+			   GtkShadowType  border);
+
+/* Completely non-functional */
+void gtk_clist_set_policy (GtkCList      *clist,
+			   GtkPolicyType  vscrollbar_policy,
+			   GtkPolicyType  hscrollbar_policy);
 #ifdef __cplusplus
 }
 #endif				/* __cplusplus */