added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.

Sun Nov 22 16:21:28 1998  Tim Janik  <timj@gtk.org>

	* gtk/gtkprogress.c: added args ::show_text, ::text_xalign,
 	::text_yalign, ::activity_mode.

	* gtk/gtkprogressbar.c: added construct arg ::adjustment. added args
 	::bar_style, ::orientation, ::discrete_blocks, ::activity_step,
 	::activity_blocks.
	(gtk_progress_bar_new):
	(gtk_progress_bar_new_with_adjustment): use gtk_widget_new().
	(gtk_progress_bar_construct): deprecated.

	* gtk/gtkvscrollbar.c:
	(gtk_vscrollbar_draw_step_back):
	(gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for
 	gtk_paint_arrow, to be consistent with hscrollbar.

	* gtk/gtktext.c
	added construct args ::hadjustment, ::vadjustment.
	added args ::line_wrap, ::word_wrap.
	(gtk_text_class_init): added scroll_adjustments signal.
	(gtk_text_new): use gtk_widget_new.
	(gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments,
	so we don't screw the reference counts and don't leave signals connected.
 	(gtk_text_destroy): disconnect adjustments signals.
 	(gtk_text_finalize): unref adjustments.

	* gtk/gtkctree.c: added construct args ::n_columns and ::tree_column.
	added args ::indent, ::spacing, ::show_stub, ::reorderable,
 	::use_drag_icons, ::line_style and ::expander_style.
	(gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is
	deprecated now.

	* gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag.
	* gtk/gtkclist.c:
 	removed ::vadjustment and ::hadjustment args, introduced
 	::scroll_adjustments signal.
	added ::shadow_type, ::selection_mode and ::row_height args.
	added n_columns construct arg.
	(gtk_clist_construct): call gtk_object_constructed().
 	(gtk_clist_set_row_height): if height is passed as 0,
	revert to automatic height calculation.
	(gtk_clist_destroy): before unrefing the adjustments, disconnect our
	signal handlers.

Fri Nov 21 22:34:58 1998  Tim Janik  <timj@gtk.org>

	* gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct
	like gtk_object_new.
	(gtk_widget_destroy): assert that we only destroy constructed widgets.

	* gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY
	to identify args that may only be used for construction.
	GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction
	time.
	* gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct
	at the end if the object is not fully constructed.
	(gtk_object_newv): likewise.
	(gtk_object_destroy): assert that we only destroy constructed objects.
 	(gtk_object_init): setup GTK_CONSTRUCTED from the
	objects real klass.
	(gtk_object_default_construct): new function to complete default
	construction of an object by applying missing construtor args with
	default values of 0, 0.0 or NULL.
	(gtk_object_constructed): new function to mark an object as being
	constructed (used from within constructors).

	* gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer
	so it is immediatedly available for the caller.

	* gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to
	the object initilizer (GtkObjectInitFunc takes a second arg now, the
 	real klass), and asure that object initializers may temporarily alter
	the class pointer.

Fri Nov 20 08:00:30 1998  Tim Janik  <timj@gtk.org>

	* gtk/testgtk.c: change all occourances of gtk_container_add (
	scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...)
	for widget!=(clist, ctree, text, viewport).

	* gtk/gtkcombo.c:
 	(gtk_combo_init): use gtk_scrolled_window_add_with_viewport()
	to add children to the scrolled window.

	* gtk/gtkscrolledwindow.h:
	* gtk/gtkscrolledwindow.c:
	changed scrolled_window->viewport to scrolled_window->child, and use
	gtk_widget_scroll_adjustements() to set the scroll adjustments for the
	widget, we do not create an additional viewport anymore.
	added ::hadjustment and ::vadjustment constructor args.
 	(gtk_scrolled_window_new): use gtk_widget_new() to create the widget.
	(gtk_scrolled_window_set_hadjustment):
	(gtk_scrolled_window_set_vadjustment): new functions that superceed
	gtk_scrolled_window_construct.
	(gtk_scrolled_window_construct): deprecated this function.

	* gtk/gtkhscrollbar.c:
	* gtk/gtkvscrollbar.c:
	* gtk/gtkhscale.c:
	* gtk/gtkvscale.c:
	support a constructor arg "::adjustment", and use gtk_widget_new() for
	the widget creation.

	* gtk/gtkrange.c: added ::update_policy arg.
 	(gtk_range_set_adjustment): if adjustment is passed in as NULL, create
 	a default adjustment so this function can be used for derived widgets
 	that depend on the adjustment's existance.
	(gtk_range_destroy): disconnect the adjustment signal, so we don't
	get called after we got destroyed, we don't destroy the adjustment
	in here, because it might have been provided from another widget.

	* gtk/gtkviewport.c: introduced ::scroll_adjustments signal.
	(gtk_viewport_destroy): same as gtk_range_destroy.

	* gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy.

	* gtk/gtkwidget.h:
	* gtk/gtkwidget.c: changed gtk_widget_activate() to return a
	gboolean, indicating whether this widget supports activation.
	added gtk_widget_scroll_adjustements() to set the scrolling
	adjustments of a widget.

Wed Nov 19 01:22:42 1998  Tim Janik  <timj@gtk.org>

	* gtk/gtkoptionmenu.c:
 	(gtk_option_menu_remove_contents):
	(gtk_option_menu_update_contents): removed
 	gtk_container_[un]block_resize() pairs.

	* gtk/gtknotebook.h:
	* gtk/gtknotebook.c: removed the tab_border field, since it shouldn't
	be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a
	wrtie-only argument.

	* *.c: made deprecated functions issue a message:
	gtk_clist_set_border, gtk_container_block_resize,
 	gtk_container_unblock_resize, gtk_container_need_resize,
 	gtk_object_class_add_user_signal, gtk_spin_button_construct,
	gtk_scrolled_window_construct.
	removed non-functional functions:
	gtk_container_disable_resize, gtk_container_enable_resize,
	gtk_clist_set_policy.

Wed Nov 18 22:54:36 1998  Tim Janik  <timj@gtk.org>

	* gtk/gtkbox.c (gtk_box_init):
	* gtk/gtkdrawingarea.c (gtk_drawing_area_init):
	* gtk/gtkeventbox.c (gtk_event_box_init):
	* gtk/gtkfixed.c (gtk_fixed_init):
	* gtk/gtkframe.c (gtk_frame_init):
	* gtk/gtkhandlebox.c (gtk_handle_box_init):
	* gtk/gtkpacker.c (gtk_packer_init):
	* gtk/gtkmisc.c (gtk_misc_init):
	* gtk/gtkpreview.c (gtk_preview_init):
	* gtk/gtkprogress.c (gtk_progress_init):
	* gtk/gtkprogressbar.c (gtk_progress_bar_init):
	* gtk/gtkseparator.c (gtk_separator_init):
	* gtk/gtktable.c (gtk_table_init):
	* gtk/gtkviewport.c (gtk_viewport_init):
	* gtk/gtkalignment.c (gtk_alignment_init):
	removed setting of the GTK_BASIC flag.

	* gtk/gtkwidget.h:
	* gtk/gtkwidget.c:
	removed GTK_BASIC, GTK_WIDGET_BASIC and	gtk_widget_basic.

	* miscellaneous GtkType and macro fixups.

1 files changed, 122 insertions, 9 deletions

diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c
index 75fa72d7aa..586d58b276 100644
--- a/gtk/gtkprogress.c
+++ b/gtk/gtkprogress.c
@@ -25,8 +25,24 @@
 
 #define EPSILON  1e-5
 
+enum {
+  ARG_0,
+  ARG_ACTIVITY_MODE,
+  ARG_SHOW_TEXT,
+  ARG_TEXT_XALIGN,
+  ARG_TEXT_YALIGN
+};
+
+
 static void gtk_progress_class_init      (GtkProgressClass *klass);
 static void gtk_progress_init            (GtkProgress      *progress);
+static void gtk_progress_set_arg	 (GtkObject        *object,
+					  GtkArg           *arg,
+					  guint             arg_id);
+static void gtk_progress_get_arg	 (GtkObject        *object,
+					  GtkArg           *arg,
+					  guint             arg_id);
+static void gtk_progress_destroy         (GtkObject        *object);
 static void gtk_progress_finalize        (GtkObject        *object);
 static void gtk_progress_realize         (GtkWidget        *widget);
 static gint gtk_progress_expose          (GtkWidget        *widget,
@@ -39,10 +55,10 @@ static void gtk_progress_create_pixmap   (GtkProgress      *progress);
 static GtkWidgetClass *parent_class = NULL;
 
 
-guint
+GtkType
 gtk_progress_get_type (void)
 {
-  static guint progress_type = 0;
+  static GtkType progress_type = 0;
 
   if (!progress_type)
     {
@@ -58,7 +74,7 @@ gtk_progress_get_type (void)
         (GtkClassInitFunc) NULL
       };
 
-      progress_type = gtk_type_unique (gtk_widget_get_type (), &progress_info);
+      progress_type = gtk_type_unique (GTK_TYPE_WIDGET, &progress_info);
     }
 
   return progress_type;
@@ -72,9 +88,28 @@ gtk_progress_class_init (GtkProgressClass *class)
 
   object_class = (GtkObjectClass *) class;
   widget_class = (GtkWidgetClass *) class;
-
-  parent_class = gtk_type_class (gtk_widget_get_type ());
-
+  parent_class = gtk_type_class (GTK_TYPE_WIDGET);
+
+  gtk_object_add_arg_type ("GtkProgress::activity_mode",
+			   GTK_TYPE_BOOL,
+			   GTK_ARG_READWRITE,
+			   ARG_ACTIVITY_MODE);
+  gtk_object_add_arg_type ("GtkProgress::show_text",
+			   GTK_TYPE_BOOL,
+			   GTK_ARG_READWRITE,
+			   ARG_SHOW_TEXT);
+  gtk_object_add_arg_type ("GtkProgress::text_xalign",
+			   GTK_TYPE_FLOAT,
+			   GTK_ARG_READWRITE,
+			   ARG_TEXT_XALIGN);
+  gtk_object_add_arg_type ("GtkProgress::text_yalign",
+			   GTK_TYPE_FLOAT,
+			   GTK_ARG_READWRITE,
+			   ARG_TEXT_YALIGN);
+
+  object_class->set_arg = gtk_progress_set_arg;
+  object_class->get_arg = gtk_progress_get_arg;
+  object_class->destroy = gtk_progress_destroy;
   object_class->finalize = gtk_progress_finalize;
 
   widget_class->realize = gtk_progress_realize;
@@ -88,10 +123,66 @@ gtk_progress_class_init (GtkProgressClass *class)
 }
 
 static void
-gtk_progress_init (GtkProgress *progress)
+gtk_progress_set_arg (GtkObject      *object,
+		      GtkArg         *arg,
+		      guint           arg_id)
 {
-  GTK_WIDGET_SET_FLAGS (progress, GTK_BASIC);
+  GtkProgress *progress;
+  
+  progress = GTK_PROGRESS (object);
+
+  switch (arg_id)
+    {
+    case ARG_ACTIVITY_MODE:
+      gtk_progress_set_activity_mode (progress, GTK_VALUE_BOOL (*arg));
+      break;
+    case ARG_SHOW_TEXT:
+      gtk_progress_set_show_text (progress, GTK_VALUE_BOOL (*arg));
+      break;
+    case ARG_TEXT_XALIGN:
+      gtk_progress_set_text_alignment (progress, GTK_VALUE_FLOAT (*arg), progress->y_align);
+      break;
+    case ARG_TEXT_YALIGN:
+      gtk_progress_set_text_alignment (progress, progress->x_align, GTK_VALUE_FLOAT (*arg));
+      break;
+    default:
+      break;
+    }
+}
+
+static void
+gtk_progress_get_arg (GtkObject      *object,
+		      GtkArg         *arg,
+		      guint           arg_id)
+{
+  GtkProgress *progress;
+  
+  progress = GTK_PROGRESS (object);
+
+  switch (arg_id)
+    {
+    case ARG_ACTIVITY_MODE:
+      GTK_VALUE_BOOL (*arg) = (progress->activity_mode != 0);
+      break;
+    case ARG_SHOW_TEXT:
+      GTK_VALUE_BOOL (*arg) = (progress->show_text != 0);
+      break;
+    case ARG_TEXT_XALIGN:
+      GTK_VALUE_FLOAT (*arg) = progress->x_align;
+      break;
+    case ARG_TEXT_YALIGN:
+      GTK_VALUE_FLOAT (*arg) = progress->y_align;
+      break;
+    default:
+      arg->type = GTK_TYPE_INVALID;
+      break;
+    }
+}
 
+static void
+gtk_progress_init (GtkProgress *progress)
+{
+  progress->adjustment = NULL;
   progress->offscreen_pixmap = NULL;
   progress->format = g_strdup ("%P %%");
   progress->x_align = 0.5;
@@ -137,6 +228,23 @@ gtk_progress_realize (GtkWidget *widget)
 }
 
 static void
+gtk_progress_destroy (GtkObject *object)
+{
+  GtkProgress *progress;
+
+  g_return_if_fail (object != NULL);
+  g_return_if_fail (GTK_IS_PROGRESS (object));
+
+  progress = GTK_PROGRESS (object);
+
+  if (progress->adjustment)
+    gtk_signal_disconnect_by_data (GTK_OBJECT (progress->adjustment),
+				   progress);
+
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
+}
+
+static void
 gtk_progress_finalize (GtkObject *object)
 {
   GtkProgress *progress;
@@ -146,7 +254,8 @@ gtk_progress_finalize (GtkObject *object)
 
   progress = GTK_PROGRESS (object);
 
-  gtk_object_unref (GTK_OBJECT (GTK_PROGRESS (object)->adjustment));
+  if (progress->adjustment)
+    gtk_object_unref (GTK_OBJECT (GTK_PROGRESS (object)->adjustment));
   
   if (progress->offscreen_pixmap)
     gdk_pixmap_unref (progress->offscreen_pixmap);
@@ -340,6 +449,10 @@ gtk_progress_set_adjustment (GtkProgress   *progress,
 {
   g_return_if_fail (progress != NULL);
   g_return_if_fail (GTK_IS_PROGRESS (progress));
+  if (adjustment)
+    g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+  else
+    adjustment = (GtkAdjustment*) gtk_object_new (GTK_TYPE_ADJUSTMENT, NULL);
 
   if (progress->adjustment != adjustment)
     {