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, 156 insertions, 34 deletions

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 177f170561..15dd706088 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -40,7 +40,8 @@ enum {
 void		      gtk_object_init_type       (void);
 static void           gtk_object_base_class_init (GtkObjectClass *klass);
 static void           gtk_object_class_init      (GtkObjectClass *klass);
-static void           gtk_object_init            (GtkObject      *object);
+static void           gtk_object_init            (GtkObject      *object,
+						  GtkObjectClass *klass);
 static void           gtk_object_set_arg         (GtkObject      *object,
 						  GtkArg         *arg,
 						  guint		  arg_id);
@@ -56,10 +57,9 @@ static guint object_signals[LAST_SIGNAL] = { 0 };
 
 static GHashTable *object_arg_info_ht = NULL;
 
-static const gchar *user_data_key = "user_data";
-static guint user_data_key_id = 0;
-static const gchar *weakrefs_key = "gtk-weakrefs";
-static guint weakrefs_key_id = 0;
+static GQuark quark_user_data = 0;
+static GQuark quark_weakrefs = 0;
+static GQuark quark_carg_history = 0;
 
 
 #ifdef G_ENABLE_DEBUG
@@ -131,6 +131,7 @@ gtk_object_base_class_init (GtkObjectClass *class)
   class->signals = NULL;
   class->nsignals = 0;
   class->n_args = 0;
+  class->construct_args = NULL;
 
   /* reset instance specifc methods that don't get inherited */
   class->get_arg = NULL;
@@ -140,6 +141,8 @@ gtk_object_base_class_init (GtkObjectClass *class)
 static void
 gtk_object_class_init (GtkObjectClass *class)
 {
+  quark_carg_history = g_quark_from_static_string ("gtk-construct-arg-history");
+
   gtk_object_add_arg_type ("GtkObject::user_data",
 			   GTK_TYPE_POINTER,
 			   GTK_ARG_READWRITE,
@@ -179,9 +182,20 @@ gtk_object_class_init (GtkObjectClass *class)
 }
 
 static void
-gtk_object_init (GtkObject *object)
+gtk_object_init (GtkObject      *object,
+		 GtkObjectClass *klass)
 {
+  gboolean needs_construction = FALSE;
+
   GTK_OBJECT_FLAGS (object) = GTK_FLOATING;
+  do
+    {
+      needs_construction |= klass->construct_args != NULL;
+      klass = gtk_type_parent_class (klass->type);
+    }
+  while (klass && !needs_construction);
+  if (!needs_construction)
+    GTK_OBJECT_FLAGS (object) |= GTK_CONSTRUCTED;
 
   object->ref_count = 1;
   g_datalist_init (&object->object_data);
@@ -208,6 +222,7 @@ gtk_object_destroy (GtkObject *object)
 {
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
+  g_return_if_fail (GTK_OBJECT_CONSTRUCTED (object));
   
   if (!GTK_OBJECT_DESTROYED (object))
     {
@@ -352,6 +367,8 @@ gtk_object_class_add_user_signal (GtkObjectClass     *class,
 
   g_return_val_if_fail (class != NULL, 0);
 
+  g_message ("gtk_object_class_add_user_signal() is deprecated");
+
   if (nparams > 0)
     {
       params = g_new (GtkType, nparams);
@@ -521,14 +538,14 @@ gtk_object_weakref (GtkObject        *object,
   g_return_if_fail (notify != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
 
-  if (!weakrefs_key_id)
-    weakrefs_key_id = g_quark_from_static_string (weakrefs_key);
+  if (!quark_weakrefs)
+    quark_weakrefs = g_quark_from_static_string ("gtk-weakrefs");
 
   weak = g_new (GtkWeakRef, 1);
-  weak->next = gtk_object_get_data_by_id (object, weakrefs_key_id);
+  weak->next = gtk_object_get_data_by_id (object, quark_weakrefs);
   weak->notify = notify;
   weak->data = data;
-  gtk_object_set_data_by_id (object, weakrefs_key_id, weak);
+  gtk_object_set_data_by_id (object, quark_weakrefs, weak);
 }
 
 void
@@ -541,17 +558,17 @@ gtk_object_weakunref (GtkObject        *object,
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
 
-  if (!weakrefs_key_id)
+  if (!quark_weakrefs)
     return;
 
-  weaks = gtk_object_get_data_by_id (object, weakrefs_key_id);
+  weaks = gtk_object_get_data_by_id (object, quark_weakrefs);
   for (wp = &weaks; *wp; wp = &(*wp)->next)
     {
       w = *wp;
       if (w->notify == notify && w->data == data)
 	{
 	  if (w == weaks)
-	    gtk_object_set_data_by_id (object, weakrefs_key_id, w->next);
+	    gtk_object_set_data_by_id (object, quark_weakrefs, w->next);
 	  else
 	    *wp = w->next;
 	  g_free (w);
@@ -563,11 +580,11 @@ gtk_object_weakunref (GtkObject        *object,
 static void
 gtk_object_notify_weaks (GtkObject *object)
 {
-  if (weakrefs_key_id)
+  if (quark_weakrefs)
     {
       GtkWeakRef *w1, *w2;
       
-      w1 = gtk_object_get_data_by_id (object, weakrefs_key_id);
+      w1 = gtk_object_get_data_by_id (object, quark_weakrefs);
       
       while (w1)
 	{
@@ -628,6 +645,9 @@ gtk_object_new (GtkType      object_type,
       gtk_args_collect_cleanup (arg_list, info_list);
     }
 
+  if (!GTK_OBJECT_CONSTRUCTED (object))
+    gtk_object_default_construct (object);
+
   return object;
 }
 
@@ -648,6 +668,9 @@ gtk_object_newv (GtkType  object_type,
   for (max_args = args + n_args; args < max_args; args++)
     gtk_object_arg_set (object, args, NULL);
   
+  if (!GTK_OBJECT_CONSTRUCTED (object))
+    gtk_object_default_construct (object);
+
   return object;
 }
 
@@ -727,9 +750,9 @@ gtk_object_set (GtkObject *object,
 }
 
 void
-gtk_object_arg_set (GtkObject *object,
-		    GtkArg      *arg,
-		    GtkArgInfo  *info)
+gtk_object_arg_set (GtkObject  *object,
+		    GtkArg     *arg,
+		    GtkArgInfo *info)
 {
   GtkObjectClass *oclass;
 
@@ -752,8 +775,15 @@ gtk_object_arg_set (GtkObject *object,
 	  return;
 	}
     }
-  
-  if (! (info->arg_flags & GTK_ARG_WRITABLE))
+
+  if (info->arg_flags & GTK_ARG_CONSTRUCT_ONLY &&
+      GTK_OBJECT_CONSTRUCTED (object))
+    {
+      g_warning ("gtk_object_arg_set(): cannot set argument \"%s\" for constructed object",
+		 info->full_name);
+      return;
+    }
+  if (!(info->arg_flags & GTK_ARG_WRITABLE))
     {
       g_warning ("gtk_object_arg_set(): argument \"%s\" is not writable",
 		 info->full_name);
@@ -770,12 +800,23 @@ gtk_object_arg_set (GtkObject *object,
   oclass = gtk_type_class (info->class_type);
   g_assert (oclass->set_arg != NULL);
   oclass->set_arg (object, arg, info->arg_id);
+  if (!GTK_OBJECT_CONSTRUCTED (object) &&
+      (info->arg_flags & GTK_ARG_CONSTRUCT_ONLY ||
+       info->arg_flags & GTK_ARG_CONSTRUCT))
+    {
+      GSList *slist;
+
+      slist = gtk_object_get_data_by_id (object, quark_carg_history);
+      gtk_object_set_data_by_id (object,
+				 quark_carg_history,
+				 g_slist_prepend (slist, info));
+    }
 }
 
 void
-gtk_object_arg_get (GtkObject           *object,
-		    GtkArg              *arg,
-		    GtkArgInfo		*info)
+gtk_object_arg_get (GtkObject  *object,
+		    GtkArg     *arg,
+		    GtkArgInfo *info)
 {
   GtkObjectClass *oclass;
   
@@ -815,11 +856,78 @@ gtk_object_arg_get (GtkObject           *object,
 }
 
 void
+gtk_object_default_construct (GtkObject *object)
+{
+  GSList *slist;
+
+  g_return_if_fail (object != NULL);
+  g_return_if_fail (GTK_IS_OBJECT (object));
+
+  if (!GTK_OBJECT_CONSTRUCTED (object))
+    {
+      for (slist = object->klass->construct_args;
+	   slist && !GTK_OBJECT_CONSTRUCTED (object);
+	   slist = slist->next)
+	{
+	  GSList *history;
+	  GtkArgInfo *info;
+	  
+	  info = slist->data;
+	  history = gtk_object_get_data_by_id (object, quark_carg_history);
+	  if (!g_slist_find (history, info))
+	    {
+	      GtkArg arg;
+	      
+	      /* default application */
+	      arg.type = info->type;
+	      arg.name = info->name;
+	      switch (gtk_type_get_varargs_type (arg.type))
+		{
+		case GTK_TYPE_FLOAT:
+		  GTK_VALUE_FLOAT (arg) = 0.0;
+		  break;
+		case GTK_TYPE_DOUBLE:
+		  GTK_VALUE_DOUBLE (arg) = 0.0;
+		  break;
+		case GTK_TYPE_BOXED:
+		case GTK_TYPE_STRING:
+		case GTK_TYPE_POINTER:
+		case GTK_TYPE_OBJECT:
+		  GTK_VALUE_POINTER (arg) = NULL;
+		  break;
+		default:
+		  memset (&arg.d, 0, sizeof (arg.d));
+		  break;
+		}
+	      gtk_object_arg_set (object, &arg, info);
+	    }
+	}
+
+      if (!GTK_OBJECT_CONSTRUCTED (object))
+	gtk_object_constructed (object);
+    }
+}
+
+void
+gtk_object_constructed (GtkObject *object)
+{
+  g_return_if_fail (object != NULL);
+  g_return_if_fail (GTK_IS_OBJECT (object));
+  g_return_if_fail (GTK_OBJECT_CONSTRUCTED (object) == FALSE);
+  
+  g_slist_free (gtk_object_get_data_by_id (object, quark_carg_history));
+  gtk_object_set_data_by_id (object, quark_carg_history, NULL);
+  GTK_OBJECT_FLAGS (object) |= GTK_CONSTRUCTED;
+}
+
+void
 gtk_object_add_arg_type (const char *arg_name,
 			 GtkType     arg_type,
 			 guint	     arg_flags,
 			 guint	     arg_id)
 {
+  GtkArgInfo *info;
+
   g_return_if_fail (arg_name != NULL);
   g_return_if_fail (arg_type > GTK_TYPE_NONE);
   g_return_if_fail (arg_id > 0);
@@ -828,18 +936,32 @@ gtk_object_add_arg_type (const char *arg_name,
     g_return_if_fail ((arg_flags & GTK_ARG_READWRITE) == GTK_ARG_READWRITE);
   else
     g_return_if_fail ((arg_flags & GTK_ARG_READWRITE) != 0);
+  if (arg_flags & GTK_ARG_CONSTRUCT_ONLY)
+    g_return_if_fail ((arg_flags & GTK_ARG_WRITABLE) == GTK_ARG_WRITABLE);
     
   if (!object_arg_info_ht)
     object_arg_info_ht = g_hash_table_new (gtk_arg_info_hash,
 					   gtk_arg_info_equal);
 
-  gtk_arg_type_new_static (GTK_TYPE_OBJECT,
-			   arg_name,
-			   GTK_STRUCT_OFFSET (GtkObjectClass, n_args),
-			   object_arg_info_ht,
-			   arg_type,
-			   arg_flags,
-			   arg_id);
+  info = gtk_arg_type_new_static (GTK_TYPE_OBJECT,
+				  arg_name,
+				  GTK_STRUCT_OFFSET (GtkObjectClass, n_args),
+				  object_arg_info_ht,
+				  arg_type,
+				  arg_flags,
+				  arg_id);
+  if (info &&
+      (info->arg_flags & GTK_ARG_CONSTRUCT ||
+       info->arg_flags & GTK_ARG_CONSTRUCT_ONLY))
+    {
+      GtkObjectClass *class;
+
+      class = gtk_type_class (info->class_type);
+      if (info->arg_flags & GTK_ARG_CONSTRUCT_ONLY)
+	class->construct_args = g_slist_prepend (class->construct_args, info);
+      else
+	class->construct_args = g_slist_append (class->construct_args, info);
+    }
 }
 
 gchar*
@@ -1003,10 +1125,10 @@ gtk_object_set_user_data (GtkObject *object,
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
 
-  if (!user_data_key_id)
-    user_data_key_id = g_quark_from_static_string (user_data_key);
+  if (!quark_user_data)
+    quark_user_data = g_quark_from_static_string ("user_data");
 
-  g_datalist_id_set_data (&object->object_data, user_data_key_id, data);
+  g_datalist_id_set_data (&object->object_data, quark_user_data, data);
 }
 
 gpointer
@@ -1015,7 +1137,7 @@ gtk_object_get_user_data (GtkObject *object)
   g_return_val_if_fail (object != NULL, NULL);
   g_return_val_if_fail (GTK_IS_OBJECT (object), NULL);
 
-  return g_datalist_id_get_data (&object->object_data, user_data_key_id);
+  return g_datalist_id_get_data (&object->object_data, quark_user_data);
 }
 
 /*******************************************