]> Pileus Git - ~andy/gtk/commitdiff
marshaller fixes.
authorTim Janik <timj@gtk.org>
Wed, 7 Mar 2001 14:49:21 +0000 (14:49 +0000)
committerTim Janik <timj@src.gnome.org>
Wed, 7 Mar 2001 14:49:21 +0000 (14:49 +0000)
Wed Mar  7 13:24:57 2001  Tim Janik  <timj@gtk.org>

        * gtk/*.c: marshaller fixes.

        * gtk/gtkmarshal.list: extreme cleanup.

        * gtk/gtktreeview.c (gtk_tree_view_class_init): disable interface
        param spec for now.

        * gtk/gtktexttag.c (gtk_text_tag_set_property): use g_value_get_boxed()
        where appliable.

        * gtk/gtktypeutils.[hc]: updates to GLib API changes.
        special cased autogenerated boxed types from gtktypebuiltins_ids.c
        which are not reference counted:
        GtkSelectionData, GdkEvent, GdkColor, GtkTextIter, PangoTabArray,
        PangoFontDescription, GtkTreeIter and GtkTreePath.

Thu Mar  1 03:58:56 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtktreeselection.h:
        * gtk/gtktreemodel.c:
        * gtk/gtktreedatalist.[hc]: fixed includes. no gobject/*
        file should be included directly, and gobject/gmarshal.h
        as well as gtk/gtkmarshal.h even can't be included directly.

        * Makefile.am: grr, install gtk-config-2.0.

        * gtk/testgtk.c:
        * gtk/simple.c:
        * gtk/gtkmenu.c:
        * gtk/gtkitemfactory.c: use g_object_connect() instead of
        passing "*signal*::*" args to gtk_widget_set().

        * gtk/gtktypeutils.[hc]: got rid of GTK_TYPE_SIGNAL.

        * gtk/*.c: removed trailer arg from property setters and getters.
        macro fixups.

Thu Mar  1 04:01:57 2001  Tim Janik  <timj@gtk.org>

        * test-gdk-pixbuf.c: fixed includes.

75 files changed:
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
Makefile.am
docs/reference/gdk/tmpl/gdk-unused.sgml
docs/reference/gtk/gtk.hierarchy
docs/reference/gtk/tmpl/gtk-unused.sgml
docs/reference/gtk/tmpl/gtkbutton.sgml
docs/reference/gtk/tmpl/gtkcellrenderer.sgml
docs/reference/gtk/tmpl/gtklabel.sgml
docs/reference/gtk/tmpl/gtksignal.sgml
docs/reference/gtk/tmpl/gtkstyle.sgml
docs/reference/gtk/tmpl/gtktextiter.sgml
docs/reference/gtk/tmpl/gtktextmark.sgml
docs/reference/gtk/tmpl/gtktexttag.sgml
docs/reference/gtk/tmpl/gtktreemodel.sgml
docs/reference/gtk/tmpl/gtktypeutils.sgml
gdk-pixbuf/ChangeLog
gdk-pixbuf/gdk-pixbuf-animation.c
gdk-pixbuf/test-gdk-pixbuf.c
gtk/gtkalignment.c
gtk/gtkarg.c
gtk/gtkargcollector.c
gtk/gtkarrow.c
gtk/gtkaspectframe.c
gtk/gtkbin.c
gtk/gtkcellrenderer.c
gtk/gtkcellrendererpixbuf.c
gtk/gtkcellrenderertext.c
gtk/gtkcellrenderertextpixbuf.c
gtk/gtkcellrenderertoggle.c
gtk/gtkclist.c
gtk/gtkcombo.c
gtk/gtkcontainer.c
gtk/gtkcurve.c
gtk/gtkhandlebox.c
gtk/gtkimagemenuitem.c
gtk/gtkimcontext.c
gtk/gtkitemfactory.c
gtk/gtklayout.c
gtk/gtklist.c
gtk/gtkmarshal.list
gtk/gtkmarshalers.list
gtk/gtkmenu.c
gtk/gtkobject.c
gtk/gtkoldeditable.c
gtk/gtkoptionmenu.c
gtk/gtktext.c
gtk/gtktextbuffer.c
gtk/gtktextlayout.c
gtk/gtktexttag.c
gtk/gtktexttagtable.c
gtk/gtktextview.c
gtk/gtktipsquery.c
gtk/gtktree.c
gtk/gtktreedatalist.c
gtk/gtktreedatalist.h
gtk/gtktreemodel.c
gtk/gtktreeselection.h
gtk/gtktreeview.c
gtk/gtktreeviewcolumn.c
gtk/gtktypeutils.c
gtk/gtktypeutils.h
gtk/gtkviewport.c
gtk/gtkwidget.c
gtk/gtkwidget.h
gtk/gtkwindow.c
gtk/simple.c
gtk/testgtk.c
tests/simple.c
tests/testgtk.c

index 5649f07513a588aae470c8fadeca48f2027f30d6..8a64745d4e209f0281f0c880dd952a587c23cf4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,45 @@
+Wed Mar  7 13:24:57 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/*.c: marshaller fixes.
+       
+       * gtk/gtkmarshal.list: extreme cleanup.
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): disable interface
+       param spec for now.
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): use g_value_get_boxed()
+       where appliable.
+
+       * gtk/gtktypeutils.[hc]: updates to GLib API changes.
+       special cased autogenerated boxed types from gtktypebuiltins_ids.c
+       which are not reference counted:
+       GtkSelectionData, GdkEvent, GdkColor, GtkTextIter, PangoTabArray,
+       PangoFontDescription, GtkTreeIter and GtkTreePath.
+
+Thu Mar  1 03:58:56 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktreeselection.h: 
+       * gtk/gtktreemodel.c:
+       * gtk/gtktreedatalist.[hc]: fixed includes. no gobject/*
+       file should be included directly, and gobject/gmarshal.h
+       as well as gtk/gtkmarshal.h even can't be included directly.
+
+       * Makefile.am: grr, install gtk-config-2.0.
+
+       * gtk/testgtk.c:
+       * gtk/simple.c:
+       * gtk/gtkmenu.c:
+       * gtk/gtkitemfactory.c: use g_object_connect() instead of
+       passing "*signal*::*" args to gtk_widget_set().
+       
+       * gtk/gtktypeutils.[hc]: got rid of GTK_TYPE_SIGNAL.
+       
+       * gtk/*.c: removed trailer arg from property setters and getters.
+       macro fixups.
+
 2001-03-07  Alexander Larsson  <alexl@redhat.com>
 
-       * gtk/gtklabel.c (set_markup):
-       Removed warning
+       * gtk/gtklabel.c (set_markup): Removed warning
 
 Tue Mar  6 19:59:12 2001  Jonathan Blandford  <jrb@redhat.com>
 
index 5649f07513a588aae470c8fadeca48f2027f30d6..8a64745d4e209f0281f0c880dd952a587c23cf4b 100644 (file)
@@ -1,7 +1,45 @@
+Wed Mar  7 13:24:57 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/*.c: marshaller fixes.
+       
+       * gtk/gtkmarshal.list: extreme cleanup.
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): disable interface
+       param spec for now.
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): use g_value_get_boxed()
+       where appliable.
+
+       * gtk/gtktypeutils.[hc]: updates to GLib API changes.
+       special cased autogenerated boxed types from gtktypebuiltins_ids.c
+       which are not reference counted:
+       GtkSelectionData, GdkEvent, GdkColor, GtkTextIter, PangoTabArray,
+       PangoFontDescription, GtkTreeIter and GtkTreePath.
+
+Thu Mar  1 03:58:56 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktreeselection.h: 
+       * gtk/gtktreemodel.c:
+       * gtk/gtktreedatalist.[hc]: fixed includes. no gobject/*
+       file should be included directly, and gobject/gmarshal.h
+       as well as gtk/gtkmarshal.h even can't be included directly.
+
+       * Makefile.am: grr, install gtk-config-2.0.
+
+       * gtk/testgtk.c:
+       * gtk/simple.c:
+       * gtk/gtkmenu.c:
+       * gtk/gtkitemfactory.c: use g_object_connect() instead of
+       passing "*signal*::*" args to gtk_widget_set().
+       
+       * gtk/gtktypeutils.[hc]: got rid of GTK_TYPE_SIGNAL.
+       
+       * gtk/*.c: removed trailer arg from property setters and getters.
+       macro fixups.
+
 2001-03-07  Alexander Larsson  <alexl@redhat.com>
 
-       * gtk/gtklabel.c (set_markup):
-       Removed warning
+       * gtk/gtklabel.c (set_markup): Removed warning
 
 Tue Mar  6 19:59:12 2001  Jonathan Blandford  <jrb@redhat.com>
 
index 5649f07513a588aae470c8fadeca48f2027f30d6..8a64745d4e209f0281f0c880dd952a587c23cf4b 100644 (file)
@@ -1,7 +1,45 @@
+Wed Mar  7 13:24:57 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/*.c: marshaller fixes.
+       
+       * gtk/gtkmarshal.list: extreme cleanup.
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): disable interface
+       param spec for now.
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): use g_value_get_boxed()
+       where appliable.
+
+       * gtk/gtktypeutils.[hc]: updates to GLib API changes.
+       special cased autogenerated boxed types from gtktypebuiltins_ids.c
+       which are not reference counted:
+       GtkSelectionData, GdkEvent, GdkColor, GtkTextIter, PangoTabArray,
+       PangoFontDescription, GtkTreeIter and GtkTreePath.
+
+Thu Mar  1 03:58:56 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktreeselection.h: 
+       * gtk/gtktreemodel.c:
+       * gtk/gtktreedatalist.[hc]: fixed includes. no gobject/*
+       file should be included directly, and gobject/gmarshal.h
+       as well as gtk/gtkmarshal.h even can't be included directly.
+
+       * Makefile.am: grr, install gtk-config-2.0.
+
+       * gtk/testgtk.c:
+       * gtk/simple.c:
+       * gtk/gtkmenu.c:
+       * gtk/gtkitemfactory.c: use g_object_connect() instead of
+       passing "*signal*::*" args to gtk_widget_set().
+       
+       * gtk/gtktypeutils.[hc]: got rid of GTK_TYPE_SIGNAL.
+       
+       * gtk/*.c: removed trailer arg from property setters and getters.
+       macro fixups.
+
 2001-03-07  Alexander Larsson  <alexl@redhat.com>
 
-       * gtk/gtklabel.c (set_markup):
-       Removed warning
+       * gtk/gtklabel.c (set_markup): Removed warning
 
 Tue Mar  6 19:59:12 2001  Jonathan Blandford  <jrb@redhat.com>
 
index 5649f07513a588aae470c8fadeca48f2027f30d6..8a64745d4e209f0281f0c880dd952a587c23cf4b 100644 (file)
@@ -1,7 +1,45 @@
+Wed Mar  7 13:24:57 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/*.c: marshaller fixes.
+       
+       * gtk/gtkmarshal.list: extreme cleanup.
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): disable interface
+       param spec for now.
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): use g_value_get_boxed()
+       where appliable.
+
+       * gtk/gtktypeutils.[hc]: updates to GLib API changes.
+       special cased autogenerated boxed types from gtktypebuiltins_ids.c
+       which are not reference counted:
+       GtkSelectionData, GdkEvent, GdkColor, GtkTextIter, PangoTabArray,
+       PangoFontDescription, GtkTreeIter and GtkTreePath.
+
+Thu Mar  1 03:58:56 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktreeselection.h: 
+       * gtk/gtktreemodel.c:
+       * gtk/gtktreedatalist.[hc]: fixed includes. no gobject/*
+       file should be included directly, and gobject/gmarshal.h
+       as well as gtk/gtkmarshal.h even can't be included directly.
+
+       * Makefile.am: grr, install gtk-config-2.0.
+
+       * gtk/testgtk.c:
+       * gtk/simple.c:
+       * gtk/gtkmenu.c:
+       * gtk/gtkitemfactory.c: use g_object_connect() instead of
+       passing "*signal*::*" args to gtk_widget_set().
+       
+       * gtk/gtktypeutils.[hc]: got rid of GTK_TYPE_SIGNAL.
+       
+       * gtk/*.c: removed trailer arg from property setters and getters.
+       macro fixups.
+
 2001-03-07  Alexander Larsson  <alexl@redhat.com>
 
-       * gtk/gtklabel.c (set_markup):
-       Removed warning
+       * gtk/gtklabel.c (set_markup): Removed warning
 
 Tue Mar  6 19:59:12 2001  Jonathan Blandford  <jrb@redhat.com>
 
index 5649f07513a588aae470c8fadeca48f2027f30d6..8a64745d4e209f0281f0c880dd952a587c23cf4b 100644 (file)
@@ -1,7 +1,45 @@
+Wed Mar  7 13:24:57 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/*.c: marshaller fixes.
+       
+       * gtk/gtkmarshal.list: extreme cleanup.
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): disable interface
+       param spec for now.
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): use g_value_get_boxed()
+       where appliable.
+
+       * gtk/gtktypeutils.[hc]: updates to GLib API changes.
+       special cased autogenerated boxed types from gtktypebuiltins_ids.c
+       which are not reference counted:
+       GtkSelectionData, GdkEvent, GdkColor, GtkTextIter, PangoTabArray,
+       PangoFontDescription, GtkTreeIter and GtkTreePath.
+
+Thu Mar  1 03:58:56 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktreeselection.h: 
+       * gtk/gtktreemodel.c:
+       * gtk/gtktreedatalist.[hc]: fixed includes. no gobject/*
+       file should be included directly, and gobject/gmarshal.h
+       as well as gtk/gtkmarshal.h even can't be included directly.
+
+       * Makefile.am: grr, install gtk-config-2.0.
+
+       * gtk/testgtk.c:
+       * gtk/simple.c:
+       * gtk/gtkmenu.c:
+       * gtk/gtkitemfactory.c: use g_object_connect() instead of
+       passing "*signal*::*" args to gtk_widget_set().
+       
+       * gtk/gtktypeutils.[hc]: got rid of GTK_TYPE_SIGNAL.
+       
+       * gtk/*.c: removed trailer arg from property setters and getters.
+       macro fixups.
+
 2001-03-07  Alexander Larsson  <alexl@redhat.com>
 
-       * gtk/gtklabel.c (set_markup):
-       Removed warning
+       * gtk/gtklabel.c (set_markup): Removed warning
 
 Tue Mar  6 19:59:12 2001  Jonathan Blandford  <jrb@redhat.com>
 
index 5649f07513a588aae470c8fadeca48f2027f30d6..8a64745d4e209f0281f0c880dd952a587c23cf4b 100644 (file)
@@ -1,7 +1,45 @@
+Wed Mar  7 13:24:57 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/*.c: marshaller fixes.
+       
+       * gtk/gtkmarshal.list: extreme cleanup.
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): disable interface
+       param spec for now.
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): use g_value_get_boxed()
+       where appliable.
+
+       * gtk/gtktypeutils.[hc]: updates to GLib API changes.
+       special cased autogenerated boxed types from gtktypebuiltins_ids.c
+       which are not reference counted:
+       GtkSelectionData, GdkEvent, GdkColor, GtkTextIter, PangoTabArray,
+       PangoFontDescription, GtkTreeIter and GtkTreePath.
+
+Thu Mar  1 03:58:56 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktreeselection.h: 
+       * gtk/gtktreemodel.c:
+       * gtk/gtktreedatalist.[hc]: fixed includes. no gobject/*
+       file should be included directly, and gobject/gmarshal.h
+       as well as gtk/gtkmarshal.h even can't be included directly.
+
+       * Makefile.am: grr, install gtk-config-2.0.
+
+       * gtk/testgtk.c:
+       * gtk/simple.c:
+       * gtk/gtkmenu.c:
+       * gtk/gtkitemfactory.c: use g_object_connect() instead of
+       passing "*signal*::*" args to gtk_widget_set().
+       
+       * gtk/gtktypeutils.[hc]: got rid of GTK_TYPE_SIGNAL.
+       
+       * gtk/*.c: removed trailer arg from property setters and getters.
+       macro fixups.
+
 2001-03-07  Alexander Larsson  <alexl@redhat.com>
 
-       * gtk/gtklabel.c (set_markup):
-       Removed warning
+       * gtk/gtklabel.c (set_markup): Removed warning
 
 Tue Mar  6 19:59:12 2001  Jonathan Blandford  <jrb@redhat.com>
 
index 5649f07513a588aae470c8fadeca48f2027f30d6..8a64745d4e209f0281f0c880dd952a587c23cf4b 100644 (file)
@@ -1,7 +1,45 @@
+Wed Mar  7 13:24:57 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/*.c: marshaller fixes.
+       
+       * gtk/gtkmarshal.list: extreme cleanup.
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): disable interface
+       param spec for now.
+
+       * gtk/gtktexttag.c (gtk_text_tag_set_property): use g_value_get_boxed()
+       where appliable.
+
+       * gtk/gtktypeutils.[hc]: updates to GLib API changes.
+       special cased autogenerated boxed types from gtktypebuiltins_ids.c
+       which are not reference counted:
+       GtkSelectionData, GdkEvent, GdkColor, GtkTextIter, PangoTabArray,
+       PangoFontDescription, GtkTreeIter and GtkTreePath.
+
+Thu Mar  1 03:58:56 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktreeselection.h: 
+       * gtk/gtktreemodel.c:
+       * gtk/gtktreedatalist.[hc]: fixed includes. no gobject/*
+       file should be included directly, and gobject/gmarshal.h
+       as well as gtk/gtkmarshal.h even can't be included directly.
+
+       * Makefile.am: grr, install gtk-config-2.0.
+
+       * gtk/testgtk.c:
+       * gtk/simple.c:
+       * gtk/gtkmenu.c:
+       * gtk/gtkitemfactory.c: use g_object_connect() instead of
+       passing "*signal*::*" args to gtk_widget_set().
+       
+       * gtk/gtktypeutils.[hc]: got rid of GTK_TYPE_SIGNAL.
+       
+       * gtk/*.c: removed trailer arg from property setters and getters.
+       macro fixups.
+
 2001-03-07  Alexander Larsson  <alexl@redhat.com>
 
-       * gtk/gtklabel.c (set_markup):
-       Removed warning
+       * gtk/gtklabel.c (set_markup): Removed warning
 
 Tue Mar  6 19:59:12 2001  Jonathan Blandford  <jrb@redhat.com>
 
index 1ee167e4112ecfa5dcef7f69aa2a8e68fda68924..6ba3ec04a380e7003aeb78c1dc0b54cb543af13b 100644 (file)
@@ -149,6 +149,10 @@ dist-hook: gtk+.spec
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gtk-2.0.m4
 
+bin_SCRIPTS=gtk-config-2.0
+BUILT_SOURCES=gtk-config-2.0
+gtk-config-2.0: gtk-config-2.0.in
+
 .PHONY: files release sanity snapshot
 
 files:
index 5a2f9d95435622b87d752d8d7fa16f0117f361ae..b5ab803635a7894db00bed636e59a27fc9d3994c 100644 (file)
@@ -1,3 +1,28 @@
+<!-- ##### SECTION ./tmpl/color_contexts.sgml:Long_Description ##### -->
+<para>
+The #GdkColorContext type is used for allocating groups of colors.
+</para>
+<para>
+It is now deprecated in favor of the gdk_colormap_*() functions described in
+the <link linkend="gdk-Colormaps-and-Colors">Colormaps and Colors</link>
+section.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/color_contexts.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/color_contexts.sgml:Short_Description ##### -->
+routines for allocating colors (deprecated).
+
+
+<!-- ##### SECTION ./tmpl/color_contexts.sgml:Title ##### -->
+Color Contexts
+
+
 <!-- ##### MACRO GDK_CORE_POINTER ##### -->
 <para>
 This macro contains an integer value representing
@@ -5,6 +30,48 @@ the device ID for the core pointer device.
 </para>
 
 
+<!-- ##### STRUCT GdkColorContext ##### -->
+<para>
+
+</para>
+
+@visual: 
+@colormap: 
+@num_colors: 
+@max_colors: 
+@num_allocated: 
+@mode: 
+@need_to_free_colormap: 
+@std_cmap_atom: 
+@clut: 
+@cmap: 
+@color_hash: 
+@palette: 
+@num_palette: 
+@fast_dither: 
+
+<!-- ##### STRUCT GdkColorContextDither ##### -->
+<para>
+
+</para>
+
+@fast_rgb: 
+@fast_err: 
+@fast_erg: 
+@fast_erb: 
+
+<!-- ##### ENUM GdkColorContextMode ##### -->
+<para>
+
+</para>
+
+@GDK_CC_MODE_UNDEFINED: 
+@GDK_CC_MODE_BW: 
+@GDK_CC_MODE_STD_CMAP: 
+@GDK_CC_MODE_TRUE: 
+@GDK_CC_MODE_MY_GRAY: 
+@GDK_CC_MODE_PALETTE: 
+
 <!-- ##### STRUCT GdkDeviceInfo ##### -->
 <para>
 The #GdkDeviceInfo structure contains information about a 
@@ -37,6 +104,137 @@ device. It has the following fields:
 @GDK_PIXBUF_ALPHA_BILEVEL: 
 @GDK_PIXBUF_ALPHA_FULL: 
 
+<!-- ##### FUNCTION gdk_color_context_add_palette ##### -->
+<para>
+
+</para>
+
+@cc: 
+@palette: 
+@num_palette: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_color_context_free ##### -->
+<para>
+
+</para>
+
+@cc: 
+
+<!-- ##### FUNCTION gdk_color_context_free_dither ##### -->
+<para>
+
+</para>
+
+@cc: 
+
+<!-- ##### FUNCTION gdk_color_context_get_index_from_palette ##### -->
+<para>
+
+</para>
+
+@cc: 
+@red: 
+@green: 
+@blue: 
+@failed: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_color_context_get_pixel ##### -->
+<para>
+
+</para>
+
+@cc: 
+@red: 
+@green: 
+@blue: 
+@failed: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_color_context_get_pixel_from_palette ##### -->
+<para>
+
+</para>
+
+@cc: 
+@red: 
+@green: 
+@blue: 
+@failed: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_color_context_get_pixels ##### -->
+<para>
+
+</para>
+
+@cc: 
+@reds: 
+@greens: 
+@blues: 
+@ncolors: 
+@colors: 
+@nallocated: 
+
+<!-- ##### FUNCTION gdk_color_context_get_pixels_incremental ##### -->
+<para>
+
+</para>
+
+@cc: 
+@reds: 
+@greens: 
+@blues: 
+@ncolors: 
+@used: 
+@colors: 
+@nallocated: 
+
+<!-- ##### FUNCTION gdk_color_context_init_dither ##### -->
+<para>
+
+</para>
+
+@cc: 
+
+<!-- ##### FUNCTION gdk_color_context_new ##### -->
+<para>
+
+</para>
+
+@visual: 
+@colormap: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_color_context_new_mono ##### -->
+<para>
+
+</para>
+
+@visual: 
+@colormap: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_color_context_query_color ##### -->
+<para>
+
+</para>
+
+@cc: 
+@color: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_color_context_query_colors ##### -->
+<para>
+
+</para>
+
+@cc: 
+@colors: 
+@num_colors: 
+@Returns: 
+
 <!-- ##### FUNCTION gdk_input_list_devices ##### -->
 <para>
 Lists all available input devices, along with their
@@ -119,4 +317,3 @@ they will be ignored.
 @ytilt: location to store current tilt in the y direction.
 @mask: location to store the current modifier state.
 
-
index be020e251a570146fc664aa16759471a7788ddbe..255c3c7dd54c88247281b6473b184825036b70a3 100644 (file)
-GtkObject
-  GtkWidget
-    GtkMisc
-      GtkLabel
-        GtkAccelLabel
-        GtkTipsQuery
-      GtkArrow
-      GtkImage
-      GtkPixmap
-    GtkContainer
-      GtkBin
-        GtkAlignment
-        GtkFrame
-          GtkAspectFrame
-        GtkButton
-          GtkToggleButton
-            GtkCheckButton
-              GtkRadioButton
-          GtkOptionMenu
-        GtkItem
-          GtkMenuItem
-            GtkCheckMenuItem
-              GtkRadioMenuItem
-            GtkTearoffMenuItem
-          GtkListItem
-          GtkTreeItem
-        GtkWindow
-          GtkDialog
-            GtkColorSelectionDialog
-            GtkFileSelection
-            GtkFontSelectionDialog
-            GtkInputDialog
-            GtkMessageDialog
-          GtkPlug
-        GtkEventBox
-        GtkHandleBox
-        GtkScrolledWindow
-        GtkViewport
-      GtkBox
-        GtkButtonBox
-          GtkHButtonBox
-          GtkVButtonBox
-        GtkVBox
-          GtkColorSelection
-          GtkFontSelection
-          GtkGammaCurve
-        GtkHBox
-          GtkCombo
-          GtkStatusbar
-      GtkCList
-        GtkCTree
-      GtkFixed
-      GtkPaned
-        GtkHPaned
-        GtkVPaned
-      GtkLayout
-      GtkList
-      GtkMenuShell
-        GtkMenu
-        GtkMenuBar
-      GtkNotebook
-      GtkPacker
-      GtkSocket
-      GtkTable
-      GtkTextView
-      GtkToolbar
-      GtkTree
-    GtkCalendar
-    GtkDrawingArea
-      GtkCurve
-    GtkEntry
-      GtkSpinButton
-    GtkRuler
-      GtkHRuler
-      GtkVRuler
-    GtkRange
-      GtkScale
-        GtkHScale
-        GtkVScale
-      GtkScrollbar
-        GtkHScrollbar
-        GtkVScrollbar
-    GtkSeparator
-      GtkHSeparator
-      GtkVSeparator
-    GtkInvisible
-    GtkOldEditable
-      GtkText
-    GtkPreview
-    GtkProgress
-      GtkProgressBar
-  GtkData
-    GtkAdjustment
-    GtkTooltips
-  GtkIMContext
-    GtkIMMulticontext
-  GtkItemFactory
+GObject
+  GdkDrawable
+    GdkWindow
+    GdkDrawableImplX11
+      GdkWindowImplX11
+    GdkPixmap
+  GdkColormap
+  GtkObject
+    GtkWidget
+      GtkMisc
+        GtkLabel
+          GtkAccelLabel
+          GtkTipsQuery
+        GtkArrow
+        GtkImage
+        GtkPixmap
+      GtkContainer
+        GtkBin
+          GtkAlignment
+          GtkFrame
+            GtkAspectFrame
+          GtkButton
+            GtkToggleButton
+              GtkCheckButton
+                GtkRadioButton
+            GtkOptionMenu
+          GtkItem
+            GtkMenuItem
+              GtkCheckMenuItem
+                GtkRadioMenuItem
+              GtkTearoffMenuItem
+            GtkListItem
+            GtkTreeItem
+          GtkWindow
+            GtkDialog
+              GtkColorSelectionDialog
+              GtkFileSelection
+              GtkFontSelectionDialog
+              GtkInputDialog
+              GtkMessageDialog
+            GtkPlug
+          GtkEventBox
+          GtkHandleBox
+          GtkScrolledWindow
+          GtkViewport
+        GtkBox
+          GtkButtonBox
+            GtkHButtonBox
+            GtkVButtonBox
+          GtkVBox
+            GtkColorSelection
+            GtkFontSelection
+            GtkGammaCurve
+          GtkHBox
+            GtkCombo
+            GtkStatusbar
+        GtkCList
+          GtkCTree
+        GtkFixed
+        GtkPaned
+          GtkHPaned
+          GtkVPaned
+        GtkLayout
+        GtkList
+        GtkMenuShell
+          GtkMenu
+          GtkMenuBar
+        GtkNotebook
+        GtkPacker
+        GtkSocket
+        GtkTable
+        GtkTextView
+        GtkToolbar
+        GtkTree
+      GtkCalendar
+      GtkDrawingArea
+        GtkCurve
+      GtkEntry
+        GtkSpinButton
+      GtkRuler
+        GtkHRuler
+        GtkVRuler
+      GtkRange
+        GtkScale
+          GtkHScale
+          GtkVScale
+        GtkScrollbar
+          GtkHScrollbar
+          GtkVScrollbar
+      GtkSeparator
+        GtkHSeparator
+        GtkVSeparator
+      GtkInvisible
+      GtkOldEditable
+        GtkText
+      GtkPreview
+      GtkProgress
+        GtkProgressBar
+    GtkData
+      GtkAdjustment
+      GtkTooltips
+    GtkIMContext
+      GtkIMMulticontext
+    GtkItemFactory
+  GtkTextBuffer
+  GtkTextTag
+  GtkTextTagTable
+  GtkStyle
+  GdkDragContext
+  GdkImage
+  GdkPixbuf
+  GtkTextChildAnchor
+  GtkTextMark
index e3fb5dcbaedb845aa3959d10bd147b05a4705957..8d8f64b286555b2b512f68c409de919a332c8247 100644 (file)
@@ -954,12 +954,6 @@ This function is labeled private.
 
 @object: the object whose signal handlers should be destroyed.
 
-<!-- ##### MACRO gtk_signal_init ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### FUNCTION gtk_signal_n_emissions ##### -->
 <para>
 Find out the recursion depth of emissions for a particular type
index cf2dd0b7fd900c6b5a8a0a2ddf633366dbb4f994..c7dda98a4c9552222d9f44de70a99381a48ca8fb 100644 (file)
@@ -127,6 +127,13 @@ Returns the current relief style of the given #GtkButton.
 @Returns: The current #GtkReliefStyle
 
 
+<!-- ##### SIGNAL GtkButton::activate ##### -->
+<para>
+
+</para>
+
+@button: the object which received the signal.
+
 <!-- ##### SIGNAL GtkButton::clicked ##### -->
 <para>\r
 Emitted when a button clicked on by the mouse and the cursor stays on the\r
index fc0aa6075bee7da08adb79584ab4ca07b8a3e9f5..48cfa899a13bf734c880ff2ddd2b7b20e1b4b2ce 100644 (file)
@@ -30,6 +30,7 @@ GtkCellRenderer
 </para>
 
 @parent: 
+@visible: 
 @xalign: 
 @yalign: 
 @xpad: 
index 921328c1fc0dedde794bec1f94403a3b6e938aa7..40e7d1d3473ccc9691062d9eb8a338bab83c31b8 100644 (file)
@@ -147,10 +147,19 @@ Gtk+ 1.0.x.
 The actual label text.  Do not write to this pointer, it is not copied.\r
 </para>
 
-<!-- ##### ARG GtkLabel:pattern ##### -->
-<para>\r
-The pattern of underlines under the existing text.  Do not change the\r
-pointer, it isn't copied.\r
+<!-- ##### ARG GtkLabel:attributes ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:use-markup ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:use-underline ##### -->
+<para>
+
 </para>
 
 <!-- ##### ARG GtkLabel:justify ##### -->
@@ -158,8 +167,24 @@ pointer, it isn't copied.
 The #GtkJustification setting.  See gtk_label_set_justify() for more info.\r
 </para>
 
+<!-- ##### ARG GtkLabel:pattern ##### -->
+<para>\r
+The pattern of underlines under the existing text.  Do not change the\r
+pointer, it isn't copied.\r
+</para>
+
 <!-- ##### ARG GtkLabel:wrap ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkLabel:selectable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:accel-keyval ##### -->
+<para>
+
+</para>
+
index c3696cb03c85e1114e382ebfd7827853d500d432..8e7a420846588147d01c7ac01fe5f4242be1d95c 100644 (file)
@@ -244,6 +244,13 @@ to the signal.
 @GTK_RUN_ACTION: 
 @GTK_RUN_NO_HOOKS: 
 
+<!-- ##### FUNCTION gtk_signal_init ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION gtk_signal_new ##### -->
 <para>
 Create a new signal type.  (This is usually done in the
@@ -301,7 +308,7 @@ you don't want a return value.
 the callbacks.
 
 
-<!-- ##### MACRO gtk_signal_lookup ##### -->
+<!-- ##### FUNCTION gtk_signal_lookup ##### -->
 <para>
 Given the name of the signal and the type of object it connects
 to, get the signal's identifying integer.  Emitting the signal
@@ -311,13 +318,12 @@ by number is somewhat faster than using the name each time.
 It also tries the ancestors of the given type.
 </para>
 
-@Returns: the signal's identifying number, or 0 if no signal was found.
-<!-- # Unused Parameters # -->
 @name: the signal's name, e.g. clicked.
 @object_type: the type that the signal operates on, e.g. #GTK_TYPE_BUTTON.
+@Returns: the signal's identifying number, or 0 if no signal was found.
 
 
-<!-- ##### MACRO gtk_signal_name ##### -->
+<!-- ##### FUNCTION gtk_signal_name ##### -->
 <para>
 Given the signal's identifier, find its name.
 </para>
@@ -325,9 +331,8 @@ Given the signal's identifier, find its name.
 Two different signals may have the same name, if they have differing types.
 </para>
 
-@Returns: the signal name, or NULL if the signal number was invalid.
-<!-- # Unused Parameters # -->
 @signal_id: the signal's identifying number.
+@Returns: the signal name, or NULL if the signal number was invalid.
 
 
 <!-- ##### FUNCTION gtk_signal_emit ##### -->
@@ -395,7 +400,7 @@ an array of GtkArgs instead of using C's varargs mechanism.
 followed by one which is a pointer to the return type.
 
 
-<!-- ##### MACRO gtk_signal_emit_stop ##### -->
+<!-- ##### FUNCTION gtk_signal_emit_stop ##### -->
 <para>
 This function aborts a signal's current emission.
 </para>
@@ -409,11 +414,11 @@ It will print a warning if used on a signal which
 isn't being emitted.
 </para>
 
-@i: 
-@s: 
-<!-- # Unused Parameters # -->
 @object: the object whose signal handlers you wish to stop.
 @signal_id: the signal identifier, as returned by gtk_signal_lookup().
+<!-- # Unused Parameters # -->
+@i: 
+@s: 
 
 
 <!-- ##### FUNCTION gtk_signal_emit_stop_by_name ##### -->
@@ -429,7 +434,7 @@ except it will lookup the signal id for you.
 @name: the name of the signal you wish to stop.
 
 
-<!-- ##### MACRO gtk_signal_connect ##### -->
+<!-- ##### FUNCTION gtk_signal_connect ##### -->
 <para>
 Attach a function pointer and user data to a signal for
 a particular object.
@@ -468,38 +473,38 @@ static void attach_print_signal(GtkButton* button, gint to_print)
 </programlisting>
 </informalexample>
 
-@o: 
-@s: 
-@f: 
-@d: 
-@Returns: the connection id.
-<!-- # Unused Parameters # -->
 @object: the object associated with the signal, e.g. if a button
 is getting pressed, this is that button.
 @name: name of the signal.
 @func: function pointer to attach to the signal.
 @func_data: value to pass as to your function (through the marshaller).
+@Returns: the connection id.
+<!-- # Unused Parameters # -->
+@o: 
+@s: 
+@f: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_connect_after ##### -->
+<!-- ##### FUNCTION gtk_signal_connect_after ##### -->
 <para>
 Attach a function pointer and user data to a signal
 so that this handler will be called after the other handlers.
 </para>
 
-@o: 
-@s: 
-@f: 
-@d: 
-@Returns: the unique identifier for this attachment:  the connection id.
-<!-- # Unused Parameters # -->
 @object: the object associated with the signal.
 @name: name of the signal.
 @func: function pointer to attach to the signal.
 @func_data: value to pass as to your function (through the marshaller).
+@Returns: the unique identifier for this attachment:  the connection id.
+<!-- # Unused Parameters # -->
+@o: 
+@s: 
+@f: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_connect_object ##### -->
+<!-- ##### FUNCTION gtk_signal_connect_object ##### -->
 <para>
 This function is for registering a callback that will
 call another object's callback.  That is,
@@ -520,21 +525,21 @@ gtk_signal_connect_object(button, "clicked", gtk_widget_show, window);
 </programlisting>
 </informalexample>
 
-@o: 
-@s: 
-@f: 
-@d: 
-@Returns: the connection id.
-<!-- # Unused Parameters # -->
 @object: the object which emits the signal.
 @name: the name of the signal.
 @func: the function to callback.
 @slot_object: the object to pass as the first parameter to func.
 (Though it pretends to take an object, you can
 really pass any gpointer as the #slot_object .)
+@Returns: the connection id.
+<!-- # Unused Parameters # -->
+@o: 
+@s: 
+@f: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_connect_object_after ##### -->
+<!-- ##### FUNCTION gtk_signal_connect_object_after ##### -->
 <para>
 Attach a signal hook to a signal, passing in an alternate
 object as the first parameter, and guaranteeing 
@@ -542,16 +547,16 @@ that the default handler and all normal
 handlers are called first.
 </para>
 
-@o: 
-@s: 
-@f: 
-@d: 
-@Returns: the connection id.
-<!-- # Unused Parameters # -->
 @object: the object associated with the signal.
 @name: name of the signal.
 @func: function pointer to attach to the signal.
 @slot_object: the object to pass as the first parameter to #func.
+@Returns: the connection id.
+<!-- # Unused Parameters # -->
+@o: 
+@s: 
+@f: 
+@d: 
 
 
 <!-- ##### FUNCTION gtk_signal_connect_full ##### -->
@@ -640,98 +645,95 @@ should signal the removal of this signal.
 @name: name of the signal.
 
 
-<!-- ##### MACRO gtk_signal_disconnect ##### -->
+<!-- ##### FUNCTION gtk_signal_disconnect ##### -->
 <para>
 Destroy a user-defined handler connection.
 </para>
 
-<!-- # Unused Parameters # -->
 @object: the object which the handler pertains to.
 @handler_id: the connection id.
 
 
-<!-- ##### MACRO gtk_signal_disconnect_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_disconnect_by_func ##### -->
 <para>
 Destroy all connections for a particular object, with
 the given function-pointer and user-data.
 </para>
 
-@o: 
-@f: 
-@d: 
-<!-- # Unused Parameters # -->
 @object: the object which emits the signal.
 @func: the function pointer to search for.
 @data: the user data to search for.
+<!-- # Unused Parameters # -->
+@o: 
+@f: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_disconnect_by_data ##### -->
+<!-- ##### FUNCTION gtk_signal_disconnect_by_data ##### -->
 <para>
 Destroy all connections for a particular object, with
 the given user-data.
 </para>
 
-@o: 
-@d: 
-<!-- # Unused Parameters # -->
 @object: the object which emits the signal.
 @data: the user data to search for.
+<!-- # Unused Parameters # -->
+@o: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_block ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_block ##### -->
 <para>
 Prevent an user-defined handler from being invoked.  All other
 signal processing will go on as normal, but this particular
 handler will ignore it.
 </para>
 
-<!-- # Unused Parameters # -->
 @object: the object which emits the signal to block.
 @handler_id: the connection id.
 
 
-<!-- ##### MACRO gtk_signal_handler_block_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_block_by_func ##### -->
 <para>
 Prevent a user-defined handler from being invoked, by reference to
 the user-defined handler's function pointer and user data.  (It may result in
 multiple hooks being blocked, if you've called connect multiple times.)
 </para>
 
-@o: 
-@f: 
-@d: 
-<!-- # Unused Parameters # -->
 @object: the object which emits the signal to block.
 @func: the function pointer of the handler to block.
 @data: the user data of the handler to block.
+<!-- # Unused Parameters # -->
+@o: 
+@f: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_block_by_data ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_block_by_data ##### -->
 <para>
 Prevent all user-defined handlers with a certain user data from being invoked.
 </para>
 
-@o: 
-@d: 
-<!-- # Unused Parameters # -->
 @object: the object which emits the signal we want to block.
 @data: the user data of the handlers to block.
+<!-- # Unused Parameters # -->
+@o: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_unblock ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_unblock ##### -->
 <para>
 Undo a block, by connection id.  Note that undoing a block doesn't
 necessarily make the hook callable, because if you block a
 hook twice, you must unblock it twice.
 </para>
 
-<!-- # Unused Parameters # -->
 @object: the object which emits the signal we want to unblock.
 @handler_id: the emission handler identifier, as returned by
 gtk_signal_connect(), etc.
 
 
-<!-- ##### MACRO gtk_signal_handler_unblock_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_unblock_by_func ##### -->
 <para>
 Undo a block, by function pointer and data.
 Note that undoing a block doesn't
@@ -739,29 +741,29 @@ necessarily make the hook callable, because if you block a
 hook twice, you must unblock it twice.
 </para>
 
-@o: 
-@f: 
-@d: 
-<!-- # Unused Parameters # -->
 @object: the object which emits the signal we want to unblock.
 @func: the function pointer to search for.
 @data: the user data to search for.
+<!-- # Unused Parameters # -->
+@o: 
+@f: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_unblock_by_data ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_unblock_by_data ##### -->
 <para>
 Undo block(s), to all signals for a particular object
 with a particular user-data pointer
 </para>
 
-@o: 
-@d: 
-<!-- # Unused Parameters # -->
 @object: the object which emits the signal we want to unblock.
 @data: the user data to search for.
+<!-- # Unused Parameters # -->
+@o: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_pending ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_pending ##### -->
 <para>
 Returns a connection id corresponding to a given signal id and object.
 </para>
@@ -772,64 +774,64 @@ may opt to not emit the signal if no one is attached anyway,
 thus saving the cost of building the arguments.
 </para>
 
-@i: 
-@s: 
-@b: 
-@Returns: the connection id, if a connection was found.  0 otherwise.
-<!-- # Unused Parameters # -->
 @object: the object to search for the desired user-defined handler.
 @signal_id: the number of the signal to search for.
 @may_be_blocked: whether it is acceptable to return a blocked
 handler.
+@Returns: the connection id, if a connection was found.  0 otherwise.
+<!-- # Unused Parameters # -->
+@i: 
+@s: 
+@b: 
 
 
-<!-- ##### MACRO gtk_signal_handler_pending_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_pending_by_func ##### -->
 <para>
 Returns a connection id corresponding to a given signal id, object, function
 pointer and user data.
 </para>
 
-@o: 
-@s: 
-@b: 
-@f: 
-@d: 
-@Returns: the connection id, if a handler was found.  0 otherwise.
-<!-- # Unused Parameters # -->
 @object: the object to search for the desired handler.
 @signal_id: the number of the signal to search for.
 @may_be_blocked: whether it is acceptable to return a blocked
 handler.
 @func: the function pointer to search for.
 @data: the user data to search for.
+@Returns: the connection id, if a handler was found.  0 otherwise.
+<!-- # Unused Parameters # -->
+@o: 
+@s: 
+@b: 
+@f: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_add_emission_hook ##### -->
+<!-- ##### FUNCTION gtk_signal_add_emission_hook ##### -->
 <para>
 Add an emission hook for a type of signal, for any object.
 </para>
 
-@i: 
-@h: 
-@d: 
-@Returns: the id (that you may pass as a parameter
-to gtk_signal_remove_emission_hook()).
-<!-- # Unused Parameters # -->
 @signal_id: the type of signal to hook for.
 @hook_func: the function to invoke to handle the emission hook.
 @data: the user data passed in to hook_func.
+@Returns: the id (that you may pass as a parameter
+to gtk_signal_remove_emission_hook()).
+<!-- # Unused Parameters # -->
+@i: 
+@h: 
+@d: 
 
 
-<!-- ##### MACRO gtk_signal_remove_emission_hook ##### -->
+<!-- ##### FUNCTION gtk_signal_remove_emission_hook ##### -->
 <para>
 Delete an emission hook. (see gtk_signal_add_emission_hook())
 </para>
 
-@i: 
-@h: 
-<!-- # Unused Parameters # -->
 @signal_id: the id of the signal type.
 @hook_id: the id of the emission handler, returned by add_emission_hook().
+<!-- # Unused Parameters # -->
+@i: 
+@h: 
 
 
 <!-- ##### MACRO gtk_signal_default_marshaller ##### -->
index adf0c1ebd876b1c9fcde24fb1b30e71dd058d2be..4876de83c62e99bf089cce1f250340032e98d9a8 100644 (file)
@@ -34,7 +34,6 @@ Styles
 
 </para>
 
-@parent_instance: 
 @fg: 
 @bg: 
 @light: 
index faf5a099e7d403f8f7faec58246e48c516245f11..473e8342ca029c32c0f6a574824fe5fbd1bc867a 100644 (file)
@@ -25,13 +25,6 @@ types related to the text widget and how they work together.
 
 </para>
 
-@parent_instance: 
-@tag_table: 
-@btree: 
-@clipboard_contents: 
-@log_attr_cache: 
-@user_action_count: 
-@modified: 
 
 <!-- ##### STRUCT GtkTextIter ##### -->
 <para>
index 204b00be577efc1ee8d1a1b5a5a584fd449efa1f..22298d22decaa4f7b5f2127393ace0c3382f6c81 100644 (file)
@@ -58,8 +58,6 @@ Marks are typically created using the gtk_text_buffer_create_mark() function.
 
 </para>
 
-@parent_instance: 
-@segment: 
 
 <!-- ##### FUNCTION gtk_text_mark_set_visible ##### -->
 <para>
index a138f63333036c0494f507f249186daaadd32be1..be71c7e39dc6f8feb1c2df8e9f0f29565d40b687 100644 (file)
@@ -26,40 +26,6 @@ types related to the text widget and how they work together.
 
 </para>
 
-@parent_instance: 
-@table: 
-@name: 
-@priority: 
-@values: 
-@bg_color_set: 
-@bg_stipple_set: 
-@fg_color_set: 
-@family_set: 
-@style_set: 
-@variant_set: 
-@weight_set: 
-@stretch_set: 
-@size_set: 
-@fg_stipple_set: 
-@justification_set: 
-@left_margin_set: 
-@indent_set: 
-@rise_set: 
-@strikethrough_set: 
-@right_margin_set: 
-@pixels_above_lines_set: 
-@pixels_below_lines_set: 
-@pixels_inside_wrap_set: 
-@tabs_set: 
-@underline_set: 
-@wrap_mode_set: 
-@bg_full_height_set: 
-@invisible_set: 
-@editable_set: 
-@language_set: 
-@pad1: 
-@pad2: 
-@pad3: 
 
 <!-- ##### STRUCT GtkTextBTreeNode ##### -->
 <para>
@@ -72,10 +38,6 @@ types related to the text widget and how they work together.
 
 </para>
 
-@parent_instance: 
-@hash: 
-@anonymous: 
-@anon_count: 
 
 <!-- ##### ENUM GtkWrapMode ##### -->
 <para>
index f188e9b48a7f2e74e69c09bfe4e9f4e10e9b3dfe..95d08bc522f20478dc273f9025dd19ffade3abb1 100644 (file)
@@ -52,7 +52,7 @@ gtktreemodel
 @g_iface: 
 @changed: 
 @inserted: 
-@child_toggled: 
+@has_child_toggled: 
 @deleted: 
 @reordered: 
 @get_flags: 
index 09743cfddf06b1685ea3aabeafd60b9ba9de7782..6295e2dfa13c7a3966a7f8539ef3509ca5119ff6 100644 (file)
@@ -45,7 +45,6 @@ fundamental types (e.g. char, uchar, int, long, float, etc).
 @GTK_TYPE_STRING: 
 @GTK_TYPE_BOXED: 
 @GTK_TYPE_POINTER: 
-@GTK_TYPE_SIGNAL: 
 
 <!-- ##### MACRO GTK_CLASS_NAME ##### -->
 <para>
@@ -561,33 +560,30 @@ Create a new, unique type.
 @type_info: must not be null, and @type_info->type_name must also not be null.
 
 
-<!-- ##### MACRO gtk_type_name ##### -->
+<!-- ##### FUNCTION gtk_type_name ##### -->
 <para>
 </para>
 
-@Returns: a pointer to the name of a type, or NULL if it has none.
-<!-- # Unused Parameters # -->
 @type: a GtkType
+@Returns: a pointer to the name of a type, or NULL if it has none.
 
 
-<!-- ##### MACRO gtk_type_from_name ##### -->
+<!-- ##### FUNCTION gtk_type_from_name ##### -->
 <para>
 Get the internal representation of a type given its name.
 </para>
 
-@Returns: a GtkType
-<!-- # Unused Parameters # -->
 @name: the name of a gtk type
+@Returns: a GtkType
 
 
-<!-- ##### MACRO gtk_type_parent ##### -->
+<!-- ##### FUNCTION gtk_type_parent ##### -->
 <para>
 
 </para>
 
-@Returns: the GtkType of the parent
-<!-- # Unused Parameters # -->
 @type: a GtkType
+@Returns: the GtkType of the parent
 
 
 <!-- ##### FUNCTION gtk_type_class ##### -->
@@ -612,16 +608,15 @@ has all the proper initializers called.
 @Returns: gpointer to a GtkTypeObject
 
 
-<!-- ##### MACRO gtk_type_is_a ##### -->
+<!-- ##### FUNCTION gtk_type_is_a ##### -->
 <para>
 Look in the type hierarchy to see if @type has @is_a_type among its
 ancestors.  Do so with a simple lookup, not a loop.
 </para>
 
-@Returns: 
-<!-- # Unused Parameters # -->
 @type: GtkType
 @is_a_type: GtkType
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_type_enum_get_values ##### -->
index 4b8d1b44ad4762528d36b5d0404cfb95219ffd71..7068bacf5168dc73eab243a27e8769b74d5a48e7 100644 (file)
@@ -1,3 +1,7 @@
+Thu Mar  1 04:01:57 2001  Tim Janik  <timj@gtk.org>
+
+       * test-gdk-pixbuf.c: fixed includes.
+
 2001-02-18  Havoc Pennington  <hp@pobox.com>
 
        * gdk-pixbuf-io.c (gdk_pixbuf_load_module): prepend underscore
index 9d4a4ae1bb93973f839df5e34f023581ac1ca70b..cc325590480c4e87538ac9add0de156dce453a74 100644 (file)
@@ -457,8 +457,10 @@ gdk_pixbuf_frame_get_type (void)
 
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("GdkPixbufFrame",
+                                            NULL,
                                             gdk_pixbuf_frame_copy,
-                                            gdk_pixbuf_frame_free);
+                                            gdk_pixbuf_frame_free,
+                                            FALSE);
 
   return our_type;
 }
index c2bfbbbf02bf8daad508073a1f9806059c17bd06..2631a024515e32a8375c52060f0ae2970cb6735f 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 #include "gdk-pixbuf.h"
-#include <gobject/gtype.h>
+#include <glib-object.h>
 
 \f
 
index 4aea6a189355bcc3b2bcd17abcf127a40f430154..c21786baaa1dae454b818270b32bfce18a796502 100644 (file)
@@ -48,13 +48,11 @@ static void gtk_alignment_size_allocate (GtkWidget         *widget,
 static void gtk_alignment_set_property (GObject         *object,
                                         guint            prop_id,
                                         const GValue    *value,
-                                        GParamSpec      *pspec,
-                                        const gchar     *trailer);
+                                        GParamSpec      *pspec);
 static void gtk_alignment_get_property (GObject         *object,
                                         guint            prop_id,
                                         GValue          *value,
-                                        GParamSpec      *pspec,
-                                        const gchar     *trailer);
+                                        GParamSpec      *pspec);
 
 GtkType
 gtk_alignment_get_type (void)
@@ -166,16 +164,16 @@ gtk_alignment_new (gfloat xalign,
   return GTK_WIDGET (alignment);
 }
 
-static void gtk_alignment_set_property (GObject         *object,
-                                        guint            prop_id,
-                                        const GValue    *value,
-                                        GParamSpec      *pspec,
-                                        const gchar     *trailer)
+static void
+gtk_alignment_set_property (GObject         *object,
+                           guint            prop_id,
+                           const GValue    *value,
+                           GParamSpec      *pspec)
 {
   GtkAlignment *alignment;
-
+  
   alignment = GTK_ALIGNMENT (object);
-
+  
   switch (prop_id)
     {
     case PROP_XALIGN:
@@ -212,16 +210,15 @@ static void gtk_alignment_set_property (GObject         *object,
     }
 }
 
-static void gtk_alignment_get_property (GObject         *object,
-                                        guint            prop_id,
-                                        GValue          *value,
-                                        GParamSpec      *pspec,
-                                        const gchar     *trailer)
+static void
+gtk_alignment_get_property (GObject         *object,
+                           guint            prop_id,
+                           GValue          *value,
+                           GParamSpec      *pspec)
 {
   GtkAlignment *alignment;
-
+  
   alignment = GTK_ALIGNMENT (object);
-  g_assert (GTK_IS_ALIGNMENT(object));
    
   switch (prop_id)
     {
index 934b4d6ef15384e219c761c6985825a91332bf18..20ba7cd025ff937f387b0660d6a875bfe3b6f577 100644 (file)
@@ -549,10 +549,6 @@ gtk_arg_values_equal (const GtkArg *arg1,
     case GTK_TYPE_POINTER:
       equal = GTK_VALUE_POINTER (*arg1) == GTK_VALUE_POINTER (*arg2);
       break;
-    case GTK_TYPE_SIGNAL:
-      equal = (GTK_VALUE_SIGNAL (*arg1).f == GTK_VALUE_SIGNAL (*arg2).f &&
-              GTK_VALUE_SIGNAL (*arg1).d == GTK_VALUE_SIGNAL (*arg2).d);
-      break;
     default:
       g_warning ("gtk_arg_values_equal() used with unknown type `%s'", gtk_type_name (arg1->type));
       equal = FALSE;
@@ -630,7 +626,6 @@ gtk_arg_to_valueloc (GtkArg  *arg,
       p_pointer = value_pointer;
       *p_pointer = GTK_VALUE_POINTER (*arg);
       break;
-    case GTK_TYPE_SIGNAL:
     case GTK_TYPE_NONE:
     case GTK_TYPE_INVALID:
       /* it doesn't make much sense to retrive these values,
index 32765018b12f067d4ed21482910905834cab20fe..47d43b08ea7df6c42739b64028c0acefd395d965 100644 (file)
@@ -111,13 +111,6 @@ G_STMT_START { \
     case GTK_TYPE_BOXED: \
       GTK_VALUE_BOXED (*arg) = va_arg (var_args, gpointer); \
       break; \
- \
-      /* structured types \
-       */ \
-    case GTK_TYPE_SIGNAL: \
-      GTK_VALUE_SIGNAL (*arg).f = va_arg (var_args, GtkSignalFunc); \
-      GTK_VALUE_SIGNAL (*arg).d = va_arg (var_args, gpointer); \
-      break; \
  \
       /* we do some extra sanity checking when collecting objects, \
        * i.e. if the object pointer is not NULL, we check whether we \
index 2252cbbd26930c04fa9af2c7f71d21e0ba8f9e95..69859b344fb3534869195349dabce58625d9509c 100644 (file)
@@ -46,13 +46,11 @@ static gint gtk_arrow_expose     (GtkWidget      *widget,
 static void gtk_arrow_set_property (GObject         *object,
                                    guint            prop_id,
                                    const GValue    *value,
-                                   GParamSpec      *pspec,
-                                   const gchar     *trailer);
+                                   GParamSpec      *pspec);
 static void gtk_arrow_get_property (GObject         *object,
                                    guint            prop_id,
                                    GValue          *value,
-                                   GParamSpec      *pspec,
-                                   const gchar     *trailer);
+                                   GParamSpec      *pspec);
 
 GtkType
 gtk_arrow_get_type (void)
@@ -113,14 +111,14 @@ gtk_arrow_class_init (GtkArrowClass *class)
   widget_class->expose_event = gtk_arrow_expose;
 }
 
-static void gtk_arrow_set_property (GObject         *object,
-                                   guint            prop_id,
-                                   const GValue    *value,
-                                   GParamSpec      *pspec,
-                                   const gchar     *trailer)
+static void
+gtk_arrow_set_property (GObject         *object,
+                       guint            prop_id,
+                       const GValue    *value,
+                       GParamSpec      *pspec)
 {
   GtkArrow *arrow;
-
+  
   arrow = GTK_ARROW (object);
 
   switch (prop_id)
@@ -142,14 +140,14 @@ static void gtk_arrow_set_property (GObject         *object,
 }
 
 
-static void gtk_arrow_get_property (GObject         *object,
-                                   guint            prop_id,
-                                   GValue          *value,
-                                   GParamSpec      *pspec,
-                                   const gchar     *trailer)
+static void
+gtk_arrow_get_property (GObject         *object,
+                       guint            prop_id,
+                       GValue          *value,
+                       GParamSpec      *pspec)
 {
   GtkArrow *arrow;
-
+  
   arrow = GTK_ARROW (object);
   switch (prop_id)
     {
index 604b4fbc2e5bb800cd07221bcfbdcb875abe56d3..8d2a9bfd8636dc50dbf8e92ad9d793a3a28e94e8 100644 (file)
@@ -45,13 +45,11 @@ static void gtk_aspect_frame_init                     (GtkAspectFrame      *aspe
 static void gtk_aspect_frame_set_property (GObject         *object,
                                           guint            prop_id,
                                           const GValue    *value,
-                                          GParamSpec      *pspec,
-                                          const gchar     *trailer);
+                                          GParamSpec      *pspec);
 static void gtk_aspect_frame_get_property (GObject         *object,
                                           guint            prop_id,
                                           GValue          *value,
-                                          GParamSpec      *pspec,
-                                          const gchar     *trailer);
+                                          GParamSpec      *pspec);
 static void gtk_aspect_frame_compute_child_allocation (GtkFrame            *frame,
                                                       GtkAllocation       *child_allocation);
 
@@ -142,11 +140,11 @@ gtk_aspect_frame_init (GtkAspectFrame *aspect_frame)
   aspect_frame->obey_child = TRUE;
 }
 
-static void gtk_aspect_frame_set_property (GObject         *object,
-                                          guint            prop_id,
-                                          const GValue    *value,
-                                          GParamSpec      *pspec,
-                                          const gchar     *trailer)
+static void
+gtk_aspect_frame_set_property (GObject         *object,
+                              guint            prop_id,
+                              const GValue    *value,
+                              GParamSpec      *pspec)
 {
   GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (object);
   
@@ -187,11 +185,11 @@ static void gtk_aspect_frame_set_property (GObject         *object,
     }
 }
 
-static void gtk_aspect_frame_get_property (GObject         *object,
-                                          guint            prop_id,
-                                          GValue          *value,
-                                          GParamSpec      *pspec,
-                                          const gchar     *trailer)
+static void
+gtk_aspect_frame_get_property (GObject         *object,
+                              guint            prop_id,
+                              GValue          *value,
+                              GParamSpec      *pspec)
 {
   GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (object);
   
index ecaff82abfcb642a954aee95ea638304ab7a3668..83d45f94ea1af0efbcedde9cadde94fc0242ba5b 100644 (file)
@@ -195,10 +195,10 @@ gtk_bin_add (GtkContainer *container,
       g_warning ("Attempting to add a widget with type %s to a %s, "
                  "but as a GtkBin subclass a %s can only contain one widget at a time; "
                  "it already contains a widget of type %s",
-                 g_type_name (G_TYPE_FROM_INSTANCE (child)),
-                 g_type_name (G_TYPE_FROM_INSTANCE (bin)),
-                 g_type_name (G_TYPE_FROM_INSTANCE (bin)),
-                 g_type_name (G_TYPE_FROM_INSTANCE (bin->child)));
+                 g_type_name (G_OBJECT_TYPE (child)),
+                 g_type_name (G_OBJECT_TYPE (bin)),
+                 g_type_name (G_OBJECT_TYPE (bin)),
+                 g_type_name (G_OBJECT_TYPE (bin->child)));
       return;
     }
 
index 99fcc09452587c54e9eac39d6abdac3dc5cf2a1e..3bf18932487e6e2dc1622eab28355c382b7ed63f 100644 (file)
@@ -25,13 +25,11 @@ static void gtk_cell_renderer_class_init (GtkCellRendererClass *class);
 static void gtk_cell_renderer_get_property  (GObject              *object,
                                             guint                 param_id,
                                             GValue               *value,
-                                            GParamSpec           *pspec,
-                                            const gchar          *trailer);
+                                            GParamSpec           *pspec);
 static void gtk_cell_renderer_set_property  (GObject              *object,
                                             guint                 param_id,
                                             const GValue         *value,
-                                            GParamSpec           *pspec,
-                                            const gchar          *trailer);
+                                            GParamSpec           *pspec);
 
 
 enum {
@@ -153,8 +151,7 @@ static void
 gtk_cell_renderer_get_property (GObject     *object,
                                guint        param_id,
                                GValue      *value,
-                               GParamSpec  *pspec,
-                               const gchar *trailer)
+                               GParamSpec  *pspec)
 {
   GtkCellRenderer *cell = GTK_CELL_RENDERER (object);
 
@@ -186,8 +183,7 @@ static void
 gtk_cell_renderer_set_property (GObject      *object,
                                guint         param_id,
                                const GValue *value,
-                               GParamSpec   *pspec,
-                               const gchar  *trailer)
+                               GParamSpec   *pspec)
 {
   GtkCellRenderer *cell = GTK_CELL_RENDERER (object);
 
index 5f58d65e6c1e7d878eeb0a0b736f12d1a2c46419..67db583562344844104806bf96647b4aba633e73 100644 (file)
 static void gtk_cell_renderer_pixbuf_get_property  (GObject                    *object,
                                                    guint                       param_id,
                                                    GValue                     *value,
-                                                   GParamSpec                 *pspec,
-                                                   const gchar                *trailer);
+                                                   GParamSpec                 *pspec);
 static void gtk_cell_renderer_pixbuf_set_property  (GObject                    *object,
                                                    guint                       param_id,
                                                    const GValue               *value,
-                                                   GParamSpec                 *pspec,
-                                                   const gchar                *trailer);
+                                                   GParamSpec                 *pspec);
 static void gtk_cell_renderer_pixbuf_init       (GtkCellRendererPixbuf      *celltext);
 static void gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class);
 static void gtk_cell_renderer_pixbuf_get_size   (GtkCellRenderer            *cell,
@@ -109,8 +107,7 @@ static void
 gtk_cell_renderer_pixbuf_get_property (GObject        *object,
                                       guint           param_id,
                                       GValue         *value,
-                                      GParamSpec     *pspec,
-                                      const gchar    *trailer)
+                                      GParamSpec     *pspec)
 {
   GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
   
@@ -131,8 +128,7 @@ static void
 gtk_cell_renderer_pixbuf_set_property (GObject      *object,
                                       guint         param_id,
                                       const GValue *value,
-                                      GParamSpec   *pspec,
-                                      const gchar  *trailer)
+                                      GParamSpec   *pspec)
 {
   GdkPixbuf *pixbuf;
   GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (object);
index de86b4b0dab647a654b3dfa5df4f593fa3dfe7e7..8e297cd84eb9c5f842579af3cd9b836efb48b28a 100644 (file)
@@ -28,13 +28,11 @@ static void gtk_cell_renderer_text_finalize   (GObject                  *object)
 static void gtk_cell_renderer_text_get_property  (GObject                  *object,
                                                  guint                     param_id,
                                                  GValue                   *value,
-                                                 GParamSpec               *pspec,
-                                                 const gchar              *trailer);
+                                                 GParamSpec               *pspec);
 static void gtk_cell_renderer_text_set_property  (GObject                  *object,
                                                  guint                     param_id,
                                                  const GValue             *value,
-                                                 GParamSpec               *pspec,
-                                                 const gchar              *trailer);
+                                                 GParamSpec               *pspec);
 static void gtk_cell_renderer_text_get_size   (GtkCellRenderer          *cell,
                                               GtkWidget                *widget,
                                               gint                     *width,
@@ -384,8 +382,7 @@ static void
 gtk_cell_renderer_text_get_property (GObject        *object,
                                     guint           param_id,
                                     GValue         *value,
-                                    GParamSpec     *pspec,
-                                    const gchar    *trailer)
+                                    GParamSpec     *pspec)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
 
@@ -655,8 +652,7 @@ static void
 gtk_cell_renderer_text_set_property (GObject      *object,
                                     guint         param_id,
                                     const GValue *value,
-                                    GParamSpec   *pspec,
-                                    const gchar  *trailer)
+                                    GParamSpec   *pspec)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
 
index 08092e8ca35afa2fcdaf49a4b1e7df5f0a19a308..9be2e15306930afa65e9dc0b8df43e882edff6bd 100644 (file)
@@ -35,13 +35,11 @@ enum {
 static void gtk_cell_renderer_text_pixbuf_get_property  (GObject                        *object,
                                                         guint                           param_id,
                                                         GValue                         *value,
-                                                        GParamSpec                     *pspec,
-                                                        const gchar                    *trailer);
+                                                        GParamSpec                     *pspec);
 static void gtk_cell_renderer_text_pixbuf_set_property  (GObject                        *object,
                                                         guint                           param_id,
                                                         const GValue                   *value,
-                                                        GParamSpec                     *pspec,
-                                                        const gchar                    *trailer);
+                                                        GParamSpec                     *pspec);
 static void gtk_cell_renderer_text_pixbuf_init       (GtkCellRendererTextPixbuf      *celltextpixbuf);
 static void gtk_cell_renderer_text_pixbuf_class_init (GtkCellRendererTextPixbufClass *class);
 static void gtk_cell_renderer_text_pixbuf_get_size   (GtkCellRenderer                *cell,
@@ -176,8 +174,7 @@ static void
 gtk_cell_renderer_text_pixbuf_get_property (GObject     *object,
                                            guint        param_id,
                                            GValue      *value,
-                                           GParamSpec  *pspec,
-                                           const gchar *trailer)
+                                           GParamSpec  *pspec)
 {
   GtkCellRendererTextPixbuf *celltextpixbuf = GTK_CELL_RENDERER_TEXT_PIXBUF (object);
   
@@ -221,8 +218,7 @@ static void
 gtk_cell_renderer_text_pixbuf_set_property (GObject      *object,
                                            guint         param_id,
                                            const GValue *value,
-                                           GParamSpec   *pspec,
-                                           const gchar  *trailer)
+                                           GParamSpec   *pspec)
 {
   GtkCellRendererTextPixbuf *celltextpixbuf = GTK_CELL_RENDERER_TEXT_PIXBUF (object);
   
index 9e1d0f541a8f9fa76a17752f2325db7f02ed197f..66f20eccae27107b36c8e3f52f3055656acdc33c 100644 (file)
 static void gtk_cell_renderer_toggle_get_property  (GObject                    *object,
                                                    guint                       param_id,
                                                    GValue                     *value,
-                                                   GParamSpec                 *pspec,
-                                                   const gchar                *trailer);
+                                                   GParamSpec                 *pspec);
 static void gtk_cell_renderer_toggle_set_property  (GObject                    *object,
                                                    guint                       param_id,
                                                    const GValue               *value,
-                                                   GParamSpec                 *pspec,
-                                                   const gchar                *trailer);
+                                                   GParamSpec                 *pspec);
 static void gtk_cell_renderer_toggle_init       (GtkCellRendererToggle      *celltext);
 static void gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class);
 static void gtk_cell_renderer_toggle_get_size   (GtkCellRenderer            *cell,
@@ -152,8 +150,7 @@ static void
 gtk_cell_renderer_toggle_get_property (GObject     *object,
                                       guint        param_id,
                                       GValue      *value,
-                                      GParamSpec  *pspec,
-                                      const gchar *trailer)
+                                      GParamSpec  *pspec)
 {
   GtkCellRendererToggle *celltoggle = GTK_CELL_RENDERER_TOGGLE (object);
   
@@ -176,8 +173,7 @@ static void
 gtk_cell_renderer_toggle_set_property (GObject      *object,
                                       guint         param_id,
                                       const GValue *value,
-                                      GParamSpec   *pspec,
-                                      const gchar  *trailer)
+                                      GParamSpec   *pspec)
 {
   GtkCellRendererToggle *celltoggle = GTK_CELL_RENDERER_TOGGLE (object);
   
index 334df0ce15b2b25b6aac8194a85a773740d28777..f5cd66157800eaaa3b6b3a84c4a55889c605873b 100644 (file)
@@ -607,7 +607,7 @@ gtk_clist_class_init (GtkCListClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__POINTER_POINTER,
+                   gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 
   clist_signals[SELECT_ROW] =
@@ -615,7 +615,7 @@ gtk_clist_class_init (GtkCListClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, select_row),
-                   gtk_marshal_VOID__INT_INT_POINTER,
+                   gtk_marshal_VOID__INT_INT_BOXED,
                    GTK_TYPE_NONE, 3,
                    GTK_TYPE_INT,
                    GTK_TYPE_INT,
@@ -625,7 +625,7 @@ gtk_clist_class_init (GtkCListClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, unselect_row),
-                   gtk_marshal_VOID__INT_INT_POINTER,
+                   gtk_marshal_VOID__INT_INT_BOXED,
                    GTK_TYPE_NONE, 3, GTK_TYPE_INT,
                    GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
   clist_signals[ROW_MOVE] =
index 02914818c659901c9dae0de2fd7cb1cac5657ab4..020ab7f28a7c2a0dd9b6e6ea363497c47a8421cc 100644 (file)
@@ -105,13 +105,11 @@ static void         gtk_combo_size_allocate      (GtkWidget        *widget,
 static void         gtk_combo_set_property       (GObject         *object,
                                                  guint            prop_id,
                                                  const GValue    *value,
-                                                 GParamSpec      *pspec,
-                                                 const gchar     *trailer);
+                                                 GParamSpec      *pspec);
 static void         gtk_combo_get_property       (GObject         *object,
                                                  guint            prop_id,
                                                  GValue          *value,
-                                                 GParamSpec      *pspec,
-                                                 const gchar     *trailer);
+                                                 GParamSpec      *pspec);
 static GtkHBoxClass *parent_class = NULL;
 
 static void
@@ -997,11 +995,11 @@ gtk_combo_disable_activate (GtkCombo* combo)
   }
 }
 
-static void gtk_combo_set_property (GObject         *object,
-                                   guint            prop_id,
-                                   const GValue    *value,
-                                   GParamSpec      *pspec,
-                                   const gchar     *trailer)
+static void
+gtk_combo_set_property (GObject         *object,
+                       guint            prop_id,
+                       const GValue    *value,
+                       GParamSpec      *pspec)
 {
   GtkCombo *combo = GTK_COMBO (object);
   
@@ -1026,11 +1024,11 @@ static void gtk_combo_set_property (GObject         *object,
   
 }
 
-static void gtk_combo_get_property (GObject         *object,
-                                   guint            prop_id,
-                                   GValue          *value,
-                                   GParamSpec      *pspec,
-                                   const gchar     *trailer)
+static void
+gtk_combo_get_property (GObject         *object,
+                       guint            prop_id,
+                       GValue          *value,
+                       GParamSpec      *pspec)
 {
   GtkCombo *combo = GTK_COMBO (object);
   
index d32eb529784f80ec4633487cbbdeafba357b5a8a..8a629578190f0642b7717dc92aea49b049111dca 100644 (file)
@@ -192,7 +192,7 @@ gtk_container_class_init (GtkContainerClass *class)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, add),
-                    gtk_marshal_VOID__POINTER,
+                    gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_WIDGET);
   container_signals[REMOVE] =
@@ -200,7 +200,7 @@ gtk_container_class_init (GtkContainerClass *class)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, remove),
-                    gtk_marshal_VOID__POINTER,
+                    gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_WIDGET);
   container_signals[CHECK_RESIZE] =
@@ -223,7 +223,7 @@ gtk_container_class_init (GtkContainerClass *class)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, set_focus_child),
-                    gtk_marshal_VOID__POINTER,
+                    gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_WIDGET);
 }
@@ -741,9 +741,9 @@ gtk_container_add (GtkContainer *container,
     {
       g_warning ("Attempting to add a widget with type %s to a container of "
                  "type %s, but the widget is already inside a container of type %s",
-                 g_type_name (G_TYPE_FROM_INSTANCE (widget)),
-                 g_type_name (G_TYPE_FROM_INSTANCE (container)),
-                 g_type_name (G_TYPE_FROM_INSTANCE (widget->parent)));
+                 g_type_name (G_OBJECT_TYPE (widget)),
+                 g_type_name (G_OBJECT_TYPE (container)),
+                 g_type_name (G_OBJECT_TYPE (widget->parent)));
       return;
     }
 
index 2b0b7c8bc5f1a9eba8647e251abd339efb076710..8954d9e56be1654467bc2952428d1d0757602052 100644 (file)
@@ -66,13 +66,11 @@ static void gtk_curve_init         (GtkCurve      *curve);
 static void gtk_curve_get_property  (GObject              *object,
                                     guint                 param_id,
                                     GValue               *value,
-                                    GParamSpec           *pspec,
-                                    const gchar          *trailer);
+                                    GParamSpec           *pspec);
 static void gtk_curve_set_property  (GObject              *object,
                                     guint                 param_id,
                                     const GValue         *value,
-                                    GParamSpec           *pspec,
-                                    const gchar          *trailer);
+                                    GParamSpec           *pspec);
 static void gtk_curve_finalize     (GObject       *object);
 static gint gtk_curve_graph_events (GtkWidget     *widget, 
                                    GdkEvent      *event, 
@@ -201,11 +199,11 @@ gtk_curve_init (GtkCurve *curve)
   gtk_curve_size_graph (curve);
 }
 
-static void gtk_curve_set_property  (GObject              *object,
-                                    guint                 prop_id,
-                                    const GValue         *value,
-                                    GParamSpec           *pspec,
-                                    const gchar          *trailer)
+static void
+gtk_curve_set_property (GObject              *object,
+                       guint                 prop_id,
+                       const GValue         *value,
+                       GParamSpec           *pspec)
 {
   GtkCurve *curve = GTK_CURVE (object);
   
@@ -236,11 +234,11 @@ static void gtk_curve_set_property  (GObject              *object,
     }
 }
 
-static void gtk_curve_get_property  (GObject              *object,
-                                    guint                 prop_id,
-                                    GValue               *value,
-                                    GParamSpec           *pspec,
-                                    const gchar          *trailer)
+static void
+gtk_curve_get_property (GObject              *object,
+                       guint                 prop_id,
+                       GValue               *value,
+                       GParamSpec           *pspec)
 {
   GtkCurve *curve = GTK_CURVE (object);
 
index d9095f9f2047936f0bb75940d5fda7e27d6d18e0..00ca124d7c8951415ed693215a9d995453656966 100644 (file)
@@ -203,7 +203,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_attached),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   handle_box_signals[SIGNAL_CHILD_DETACHED] =
@@ -211,7 +211,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_detached),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
 }
index 621a9cdc2dd6f5c6ea4531b5b289b1ea32241403..2130759fd26933bff962e6f55d60c865aa6c440e 100644 (file)
@@ -52,13 +52,11 @@ static void gtk_image_menu_item_forall     (GtkContainer   *container,
 static void gtk_image_menu_item_set_property (GObject         *object,
                                               guint            prop_id,
                                               const GValue    *value,
-                                              GParamSpec      *pspec,
-                                              const gchar     *trailer);
+                                              GParamSpec      *pspec);
 static void gtk_image_menu_item_get_property (GObject         *object,
                                               guint            prop_id,
                                               GValue          *value,
-                                              GParamSpec      *pspec,
-                                              const gchar     *trailer);
+                                              GParamSpec      *pspec);
 
 
 enum {
@@ -143,8 +141,7 @@ static void
 gtk_image_menu_item_set_property (GObject         *object,
                                   guint            prop_id,
                                   const GValue    *value,
-                                  GParamSpec      *pspec,
-                                  const gchar     *trailer)
+                                  GParamSpec      *pspec)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (object);
   
@@ -179,8 +176,7 @@ static void
 gtk_image_menu_item_get_property (GObject         *object,
                                   guint            prop_id,
                                   GValue          *value,
-                                  GParamSpec      *pspec,
-                                  const gchar     *trailer)
+                                  GParamSpec      *pspec)
 {
   GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (object);
   
index 7c72460761d656e2d4a1aae3d3faf6f973123895..371985e9fd3a7cf2450b92e797e8d3f3ef82e7b2 100644 (file)
@@ -104,7 +104,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkIMContextClass, commit),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__STRING,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STRING);
 }
index f0aecf338e768b8a2dcd992d940146ffa09678bb..c1b3da1b1e3a8370ad83ffca72d5fdf3f028c130 100644 (file)
@@ -596,10 +596,9 @@ gtk_item_factory_construct (GtkItemFactory *ifactory,
     ifactory->accel_group = gtk_accel_group_new ();
 
   ifactory->path = g_strdup (path);
-  ifactory->widget =
-    gtk_widget_new (container_type,
-                   "GtkObject::signal::destroy", gtk_widget_destroyed, &ifactory->widget,
-                   NULL);
+  ifactory->widget = g_object_connect (gtk_widget_new (container_type, NULL),
+                                      "signal::destroy", gtk_widget_destroyed, &ifactory->widget,
+                                      NULL);
   gtk_object_ref (GTK_OBJECT (ifactory));
   gtk_object_sink (GTK_OBJECT (ifactory));
 
index 48bfa2ec760162a23e40fb69446968c0191c4392..a80ceac43ec8b91b021ea14f968bb384cc69f1e9 100644 (file)
@@ -397,7 +397,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkLayoutClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__POINTER_POINTER,
+                   gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 }
 
index a756ff3e0694845cabea6acb33d2d55d4ff7ac58..7d0ee82b8fc995886dd611b4c68dfd9e0bde5d48 100644 (file)
@@ -255,7 +255,7 @@ gtk_list_class_init (GtkListClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkListClass, select_child),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   list_signals[UNSELECT_CHILD] =
@@ -263,7 +263,7 @@ gtk_list_class_init (GtkListClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkListClass, unselect_child),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   
index 96579a2d509f491cb9e5d73992d542bbd7e4fcbc..5d6cd91cfeea272f68bcc0c2a6a49011ba52effb 100644 (file)
 #   BOOL        deprecated alias for BOOLEAN
 
 BOOLEAN:BOXED
-BOOLEAN:BOXED,BOXED
-BOOLEAN:BOXED,BOXED,INT
-BOOLEAN:POINTER
-BOOLEAN:POINTER,POINTER
-BOOLEAN:POINTER,INT,INT
-BOOLEAN:POINTER,INT,INT,UINT
-BOOLEAN:POINTER,POINTER,INT
-BOOLEAN:POINTER,POINTER,INT,INT
-BOOLEAN:POINTER,STRING,STRING,POINTER
+BOOLEAN:BOXED,INT,INT,UINT
+BOOLEAN:OBJECT,STRING,STRING,BOXED
 BOOLEAN:VOID
-BOXED:BOXED
 ENUM:ENUM
-INT:INT
-INT:BOXED
 INT:OBJECT,BOXED,BOXED
 INT:POINTER
-INT:POINTER,CHAR,CHAR
-INT:VOID
-POINTER:POINTER
-POINTER:POINTER,INT
-POINTER:VOID
+NONE:BOOL
+NONE:INT
+NONE:INT,INT
+NONE:NONE
+NONE:POINTER
+NONE:STRING,INT,POINTER
 VOID:BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
-VOID:BOXED,BOXED,BOOLEAN
-VOID:BOXED,STRING,INT
-VOID:BOXED,INT,POINTER
+VOID:BOXED,BOXED,UINT,UINT
+VOID:BOXED,INT,INT,BOXED,UINT,UINT
 VOID:BOXED,OBJECT
+VOID:BOXED,STRING,INT
+VOID:BOXED,UINT
 VOID:BOXED,UINT,FLAGS
+VOID:BOXED,UINT,UINT
 VOID:ENUM
 VOID:ENUM,FLOAT
-VOID:ENUM,FLOAT,BOOLEAN
+VOID:ENUM,FLOAT,BOOL
+VOID:ENUM,INT
 VOID:ENUM,INT,BOOLEAN
 VOID:INT
 VOID:INT,INT
+VOID:INT,INT,BOXED
 VOID:INT,INT,INT
-VOID:INT,INT,INT,INT
-VOID:INT,INT,POINTER
 VOID:OBJECT
-VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,BOOLEAN
+VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,INT,INT
-VOID:ENUM,INT
+VOID:OBJECT,OBJECT
+VOID:OBJECT,STRING,STRING
 VOID:POINTER
-VOID:POINTER,BOOLEAN
 VOID:POINTER,INT
-VOID:POINTER,INT,INT,POINTER,UINT,UINT
-VOID:POINTER,INT,POINTER
-VOID:POINTER,POINTER,BOOLEAN
-VOID:POINTER,POINTER,INT
-VOID:POINTER,POINTER,INT,BOOLEAN
-VOID:POINTER,POINTER,INT,INT
 VOID:POINTER,POINTER,POINTER
-VOID:POINTER,POINTER,UINT,UINT
-VOID:POINTER,STRING,STRING
 VOID:POINTER,UINT
-VOID:POINTER,UINT,ENUM
-VOID:POINTER,UINT,UINT
 VOID:STRING
 VOID:STRING,INT,POINTER
-VOID:STRING,POINTER
-VOID:UINT
 VOID:UINT,BOXED,UINT,FLAGS,FLAGS
-VOID:UINT,POINTER,UINT,ENUM,ENUM,POINTER
-VOID:UINT,POINTER,UINT,UINT,ENUM
 VOID:UINT,STRING
 VOID:VOID
-
-# deprecated, compatibility aliases:
-BOOL:NONE
-BOOL:POINTER
-BOOL:POINTER,INT,INT
-BOOL:POINTER,INT,INT,UINT
-BOOL:POINTER,POINTER,INT,INT
-BOOL:POINTER,STRING,STRING,POINTER
-INT:NONE
-POINTER:NONE
-NONE:BOOL
-NONE:BOXED
-NONE:ENUM
-NONE:ENUM,FLOAT
-NONE:ENUM,FLOAT,BOOL
-NONE:INT
-NONE:INT,INT
-NONE:INT,INT,INT
-NONE:INT,INT,POINTER
-NONE:NONE
-NONE:OBJECT
-NONE:POINTER
-NONE:POINTER,INT
-NONE:POINTER,INT,INT,POINTER,UINT,UINT
-NONE:POINTER,INT,POINTER
-NONE:POINTER,POINTER
-NONE:POINTER,POINTER,INT
-NONE:POINTER,POINTER,INT,INT
-NONE:POINTER,POINTER,POINTER
-NONE:POINTER,POINTER,UINT,UINT
-NONE:POINTER,STRING,STRING
-NONE:POINTER,UINT
-NONE:POINTER,UINT,ENUM
-NONE:POINTER,UINT,UINT
-NONE:STRING
-NONE:STRING,INT,POINTER
-NONE:STRING,POINTER
-NONE:UINT
-NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
-NONE:UINT,POINTER,UINT,UINT,ENUM
-NONE:UINT,STRING
-VOID:ENUM,FLOAT,BOOL
index 96579a2d509f491cb9e5d73992d542bbd7e4fcbc..5d6cd91cfeea272f68bcc0c2a6a49011ba52effb 100644 (file)
 #   BOOL        deprecated alias for BOOLEAN
 
 BOOLEAN:BOXED
-BOOLEAN:BOXED,BOXED
-BOOLEAN:BOXED,BOXED,INT
-BOOLEAN:POINTER
-BOOLEAN:POINTER,POINTER
-BOOLEAN:POINTER,INT,INT
-BOOLEAN:POINTER,INT,INT,UINT
-BOOLEAN:POINTER,POINTER,INT
-BOOLEAN:POINTER,POINTER,INT,INT
-BOOLEAN:POINTER,STRING,STRING,POINTER
+BOOLEAN:BOXED,INT,INT,UINT
+BOOLEAN:OBJECT,STRING,STRING,BOXED
 BOOLEAN:VOID
-BOXED:BOXED
 ENUM:ENUM
-INT:INT
-INT:BOXED
 INT:OBJECT,BOXED,BOXED
 INT:POINTER
-INT:POINTER,CHAR,CHAR
-INT:VOID
-POINTER:POINTER
-POINTER:POINTER,INT
-POINTER:VOID
+NONE:BOOL
+NONE:INT
+NONE:INT,INT
+NONE:NONE
+NONE:POINTER
+NONE:STRING,INT,POINTER
 VOID:BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
-VOID:BOXED,BOXED,BOOLEAN
-VOID:BOXED,STRING,INT
-VOID:BOXED,INT,POINTER
+VOID:BOXED,BOXED,UINT,UINT
+VOID:BOXED,INT,INT,BOXED,UINT,UINT
 VOID:BOXED,OBJECT
+VOID:BOXED,STRING,INT
+VOID:BOXED,UINT
 VOID:BOXED,UINT,FLAGS
+VOID:BOXED,UINT,UINT
 VOID:ENUM
 VOID:ENUM,FLOAT
-VOID:ENUM,FLOAT,BOOLEAN
+VOID:ENUM,FLOAT,BOOL
+VOID:ENUM,INT
 VOID:ENUM,INT,BOOLEAN
 VOID:INT
 VOID:INT,INT
+VOID:INT,INT,BOXED
 VOID:INT,INT,INT
-VOID:INT,INT,INT,INT
-VOID:INT,INT,POINTER
 VOID:OBJECT
-VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,BOOLEAN
+VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,INT,INT
-VOID:ENUM,INT
+VOID:OBJECT,OBJECT
+VOID:OBJECT,STRING,STRING
 VOID:POINTER
-VOID:POINTER,BOOLEAN
 VOID:POINTER,INT
-VOID:POINTER,INT,INT,POINTER,UINT,UINT
-VOID:POINTER,INT,POINTER
-VOID:POINTER,POINTER,BOOLEAN
-VOID:POINTER,POINTER,INT
-VOID:POINTER,POINTER,INT,BOOLEAN
-VOID:POINTER,POINTER,INT,INT
 VOID:POINTER,POINTER,POINTER
-VOID:POINTER,POINTER,UINT,UINT
-VOID:POINTER,STRING,STRING
 VOID:POINTER,UINT
-VOID:POINTER,UINT,ENUM
-VOID:POINTER,UINT,UINT
 VOID:STRING
 VOID:STRING,INT,POINTER
-VOID:STRING,POINTER
-VOID:UINT
 VOID:UINT,BOXED,UINT,FLAGS,FLAGS
-VOID:UINT,POINTER,UINT,ENUM,ENUM,POINTER
-VOID:UINT,POINTER,UINT,UINT,ENUM
 VOID:UINT,STRING
 VOID:VOID
-
-# deprecated, compatibility aliases:
-BOOL:NONE
-BOOL:POINTER
-BOOL:POINTER,INT,INT
-BOOL:POINTER,INT,INT,UINT
-BOOL:POINTER,POINTER,INT,INT
-BOOL:POINTER,STRING,STRING,POINTER
-INT:NONE
-POINTER:NONE
-NONE:BOOL
-NONE:BOXED
-NONE:ENUM
-NONE:ENUM,FLOAT
-NONE:ENUM,FLOAT,BOOL
-NONE:INT
-NONE:INT,INT
-NONE:INT,INT,INT
-NONE:INT,INT,POINTER
-NONE:NONE
-NONE:OBJECT
-NONE:POINTER
-NONE:POINTER,INT
-NONE:POINTER,INT,INT,POINTER,UINT,UINT
-NONE:POINTER,INT,POINTER
-NONE:POINTER,POINTER
-NONE:POINTER,POINTER,INT
-NONE:POINTER,POINTER,INT,INT
-NONE:POINTER,POINTER,POINTER
-NONE:POINTER,POINTER,UINT,UINT
-NONE:POINTER,STRING,STRING
-NONE:POINTER,UINT
-NONE:POINTER,UINT,ENUM
-NONE:POINTER,UINT,UINT
-NONE:STRING
-NONE:STRING,INT,POINTER
-NONE:STRING,POINTER
-NONE:UINT
-NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
-NONE:UINT,POINTER,UINT,UINT,ENUM
-NONE:UINT,STRING
-VOID:ENUM,FLOAT,BOOL
index b7b01a7f5f4f6be2be535d12303f22c259b1d05b..0f49d09495bdc1a44ad6dfc9b5b402bbd9553a02 100644 (file)
@@ -239,12 +239,13 @@ gtk_menu_init (GtkMenu *menu)
   menu->position_func_data = NULL;
   menu->toggle_size = 0;
 
-  menu->toplevel = gtk_widget_new (GTK_TYPE_WINDOW,
-                                  "type", GTK_WINDOW_POPUP,
-                                  "signal::event", gtk_menu_window_event, menu,
-                                  "signal::destroy", gtk_widget_destroyed, &menu->toplevel,
-                                  "child", menu,
-                                  NULL);
+  menu->toplevel = g_object_connect (gtk_widget_new (GTK_TYPE_WINDOW,
+                                                    "type", GTK_WINDOW_POPUP,
+                                                    "child", menu,
+                                                    NULL),
+                                    "signal::event", gtk_menu_window_event, menu,
+                                    "signal::destroy", gtk_widget_destroyed, &menu->toplevel,
+                                    NULL);
   gtk_window_set_policy (GTK_WINDOW (menu->toplevel),
                         FALSE, FALSE, TRUE);
 
@@ -836,10 +837,11 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
              GtkWidget *attach_widget;
              gchar *title;
              
-             menu->tearoff_window = gtk_widget_new (GTK_TYPE_WINDOW,
-                                                    "type", GTK_WINDOW_TOPLEVEL,
-                                                    "signal::destroy", gtk_widget_destroyed, &menu->tearoff_window,
-                                                    NULL);
+             menu->tearoff_window = g_object_connect (gtk_widget_new (GTK_TYPE_WINDOW,
+                                                                      "type", GTK_WINDOW_TOPLEVEL,
+                                                                      NULL),
+                                                      "signal::destroy", gtk_widget_destroyed, &menu->tearoff_window,
+                                                      NULL);
              gtk_window_set_type_hint (GTK_WINDOW (menu->tearoff_window),
                                        GDK_WINDOW_TYPE_HINT_MENU);
              gtk_widget_set_app_paintable (menu->tearoff_window, TRUE);
@@ -883,9 +885,9 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
                                                    MENU_SCROLL_STEP,
                                                    height/2,
                                                    height));
-             gtk_signal_connect (GTK_OBJECT (menu->tearoff_adjustment), "value_changed",
-                                 gtk_menu_scrollbar_changed,
-                                 menu);
+             g_object_connect (GTK_OBJECT (menu->tearoff_adjustment),
+                               "signal::value_changed", gtk_menu_scrollbar_changed, menu,
+                               NULL);
              menu->tearoff_scrollbar = gtk_vscrollbar_new (menu->tearoff_adjustment);
 
              gtk_box_pack_end (GTK_BOX (menu->tearoff_hbox),
index 3931af9c21e8a01924dfc0dc3fb2296a84c97dd6..272eef2f8953e7c8f8e4d0f73cc514a0617ff29a 100644 (file)
@@ -50,13 +50,11 @@ static void       gtk_object_init                (GtkObject      *object,
 static void      gtk_object_set_property        (GObject        *object,
                                                  guint           property_id,
                                                  const GValue   *value,
-                                                 GParamSpec     *pspec,
-                                                 const gchar    *trailer);
+                                                 GParamSpec     *pspec);
 static void      gtk_object_get_property        (GObject        *object,
                                                  guint           property_id,
                                                  GValue         *value,
-                                                 GParamSpec     *pspec,
-                                                 const gchar    *trailer);
+                                                 GParamSpec     *pspec);
 static void       gtk_object_shutdown            (GObject        *object);
 static void       gtk_object_real_destroy        (GtkObject      *object);
 static void       gtk_object_finalize            (GObject        *object);
@@ -175,8 +173,7 @@ static void
 gtk_arg_proxy_set_property (GObject      *object,
                            guint         property_id,
                            const GValue *value,
-                           GParamSpec   *pspec,
-                           const gchar  *trailer)
+                           GParamSpec   *pspec)
 {
   GtkObjectClass *class = g_type_class_peek (pspec->owner_type);
   GtkArg arg;
@@ -194,8 +191,7 @@ static void
 gtk_arg_proxy_get_property (GObject     *object,
                            guint        property_id,
                            GValue      *value,
-                           GParamSpec  *pspec,
-                           const gchar *trailer)
+                           GParamSpec  *pspec)
 {
   GtkObjectClass *class = g_type_class_peek (pspec->owner_type);
   GtkArg arg;
@@ -413,8 +409,7 @@ static void
 gtk_object_set_property (GObject      *object,
                         guint         property_id,
                         const GValue *value,
-                        GParamSpec   *pspec,
-                        const gchar  *trailer)
+                        GParamSpec   *pspec)
 {
   switch (property_id)
     {
@@ -431,14 +426,11 @@ static void
 gtk_object_get_property (GObject     *object,
                         guint        property_id,
                         GValue      *value,
-                        GParamSpec  *pspec,
-                        const gchar *trailer)
+                        GParamSpec  *pspec)
 {
   switch (property_id)
     {
     case PROP_USER_DATA:
-      g_return_if_fail (trailer != NULL);
-
       g_value_set_pointer (value, gtk_object_get_user_data (GTK_OBJECT (object)));
       break;
     default:
index ee3bdbb79020ee9743693c9c95c7b5a8b69d2014..6a0c8a0f296d6562d1a61fffbb17a462bb3c875e 100644 (file)
@@ -220,7 +220,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, insert_text),
-                   gtk_marshal_NONE__POINTER_INT_POINTER,
+                   gtk_marshal_NONE__STRING_INT_POINTER,
                    GTK_TYPE_NONE,
                    3,
                    GTK_TYPE_STRING,
index 9d9a259968d2efdba7c5dad0a5721cba33450cf8..4027394216717ba08e09abd1b92b6be4ba7a0ff4 100644 (file)
@@ -121,7 +121,7 @@ gtk_option_menu_class_init (GtkOptionMenuClass *class)
 
   signals[CHANGED] =
     g_signal_newc ("changed",
-                   G_TYPE_FROM_CLASS (class),
+                   G_OBJECT_CLASS_TYPE (class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkOptionMenuClass, changed),
                    NULL,
index 95aef29b8b0a02b4c2c740426b0f77f96b5e312f..c54cd6930aaaee789935219cf0b774ca7da1521a 100644 (file)
@@ -606,7 +606,7 @@ gtk_text_class_init (GtkTextClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTextClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__POINTER_POINTER,
+                   gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 }
 
index b2052f609232743fddca33729514a856de6479d8..4440ee08540e876fdd60d5f7156fd8df71835374 100644 (file)
@@ -158,7 +158,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[INSERT_TEXT] =
     g_signal_newc ("insert_text",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextBufferClass, insert_text),
                    NULL,
@@ -176,7 +176,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[INSERT_PIXBUF] =
     g_signal_newc ("insert_pixbuf",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf),
                    NULL,
@@ -192,7 +192,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[INSERT_CHILD_ANCHOR] =
     g_signal_newc ("insert_child_anchor",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor),
                    NULL,
@@ -208,7 +208,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
   
   signals[DELETE_RANGE] =
     g_signal_newc ("delete_range",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextBufferClass, delete_range),
                    NULL,
@@ -225,7 +225,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[CHANGED] =
     g_signal_newc ("changed",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,                   
                    G_STRUCT_OFFSET (GtkTextBufferClass, changed),
                    NULL,
@@ -235,7 +235,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[MODIFIED_CHANGED] =
     g_signal_newc ("modified_changed",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed),
                    NULL,
@@ -245,7 +245,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[MARK_SET] =
     g_signal_newc ("mark_set",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,                   
                    G_STRUCT_OFFSET (GtkTextBufferClass, mark_set),
                    NULL,
@@ -257,7 +257,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[MARK_DELETED] =
     g_signal_newc ("mark_deleted",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,                   
                    G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted),
                    NULL,
@@ -268,7 +268,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
   
   signals[APPLY_TAG] =
     g_signal_newc ("apply_tag",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag),
                    NULL,
@@ -281,7 +281,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[REMOVE_TAG] =
     g_signal_newc ("remove_tag",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag),
                    NULL,
@@ -294,7 +294,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[BEGIN_USER_ACTION] =
     g_signal_newc ("begin_user_action",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,                   
                    G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action),
                    NULL,
@@ -304,7 +304,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 
   signals[END_USER_ACTION] =
     g_signal_newc ("end_user_action",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,                   
                    G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action),
                    NULL,
index 8cf21002a6c3f9d2521d0827cf366c47ef4bf938..70198f7dcf22384e11b28e29816b17c0cba08cf7 100644 (file)
@@ -173,7 +173,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
 
   signals[INVALIDATED] =
     g_signal_newc ("invalidated",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextLayoutClass, invalidated),
                    NULL,
@@ -183,7 +183,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
 
   signals[CHANGED] =
     g_signal_newc ("changed",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextLayoutClass, changed),
                    NULL,
@@ -196,7 +196,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
 
   signals[ALLOCATE_CHILD] =
     g_signal_newc ("allocate_child",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child),
                    NULL,
index 4340000ff9b7ee337711188c681f464533ae1608..7d5a0c2677e682a42ec896c48dd0332cac8e452d 100644 (file)
@@ -139,13 +139,11 @@ static void gtk_text_tag_finalize     (GObject         *object);
 static void gtk_text_tag_set_property (GObject         *object,
                                        guint            prop_id,
                                        const GValue    *value,
-                                       GParamSpec      *pspec,
-                                       const gchar     *trailer);
+                                       GParamSpec      *pspec);
 static void gtk_text_tag_get_property (GObject         *object,
                                        guint            prop_id,
                                        GValue          *value,
-                                       GParamSpec      *pspec,
-                                       const gchar     *trailer);
+                                       GParamSpec      *pspec);
 
 static GObjectClass *parent_class = NULL;
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -603,7 +601,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
 
   signals[EVENT] =
     g_signal_newc ("event",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    GTK_SIGNAL_OFFSET (GtkTextTagClass, event),
                    NULL,
@@ -779,8 +777,7 @@ static void
 gtk_text_tag_set_property (GObject      *object,
                            guint         prop_id,
                            const GValue *value,
-                           GParamSpec   *pspec,
-                           const gchar  *trailer)
+                           GParamSpec   *pspec)
 {
   GtkTextTag *text_tag;
   gboolean size_changed = FALSE;
@@ -824,21 +821,23 @@ gtk_text_tag_set_property (GObject      *object,
 
     case PROP_BACKGROUND_GDK:
       {
-        GdkColor *color = g_value_get_as_pointer (value);
+        GdkColor *color = g_value_get_boxed (value);
+
         set_bg_color (text_tag, color);
       }
       break;
 
     case PROP_FOREGROUND_GDK:
       {
-        GdkColor *color = g_value_get_as_pointer (value);
+        GdkColor *color = g_value_get_boxed (value);
+
         set_fg_color (text_tag, color);
       }
       break;
 
     case PROP_BACKGROUND_STIPPLE:
       {
-        GdkBitmap *bitmap = g_value_get_as_pointer (value);
+        GdkBitmap *bitmap = g_value_get_boxed (value);
 
         text_tag->bg_stipple_set = TRUE;
         g_object_notify (G_OBJECT (text_tag), "background_stipple_set");
@@ -858,7 +857,7 @@ gtk_text_tag_set_property (GObject      *object,
 
     case PROP_FOREGROUND_STIPPLE:
       {
-        GdkBitmap *bitmap = g_value_get_as_pointer (value);
+        GdkBitmap *bitmap = g_value_get_boxed (value);
 
         text_tag->fg_stipple_set = TRUE;
         g_object_notify (G_OBJECT (text_tag), "foreground_stipple_set");
@@ -899,7 +898,7 @@ gtk_text_tag_set_property (GObject      *object,
       {
         PangoFontDescription *font_desc;
 
-        font_desc = g_value_get_as_pointer (value);
+        font_desc = g_value_get_boxed (value);
 
         set_font_description (text_tag, font_desc);
 
@@ -1079,7 +1078,7 @@ gtk_text_tag_set_property (GObject      *object,
 
       /* FIXME I'm not sure if this is a memleak or not */
       text_tag->values->tabs =
-        pango_tab_array_copy (g_value_get_as_pointer (value));
+        pango_tab_array_copy (g_value_get_boxed (value));
 
       g_object_notify (G_OBJECT (text_tag), "tabs_set");
       
@@ -1265,8 +1264,7 @@ static void
 gtk_text_tag_get_property (GObject      *object,
                            guint         prop_id,
                            GValue       *value,
-                           GParamSpec   *pspec,
-                           const gchar  *trailer)
+                           GParamSpec   *pspec)
 {
   GtkTextTag *tag;
 
index 3ad3668c65027d0d585ad822324afe5b424357a1..8f456e10f174e4110dc86c3bb211673690caae72 100644 (file)
@@ -21,13 +21,11 @@ static void gtk_text_tag_table_finalize     (GObject              *object);
 static void gtk_text_tag_table_set_property (GObject              *object,
                                              guint                 prop_id,
                                              const GValue         *value,
-                                             GParamSpec           *pspec,
-                                             const gchar          *trailer);
+                                             GParamSpec           *pspec);
 static void gtk_text_tag_table_get_property (GObject              *object,
                                              guint                 prop_id,
                                              GValue               *value,
-                                             GParamSpec           *pspec,
-                                             const gchar          *trailer);
+                                             GParamSpec           *pspec);
 
 static GObjectClass *parent_class = NULL;
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -75,7 +73,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
   
   signals[TAG_CHANGED] =
     g_signal_newc ("tag_changed",
-                   G_TYPE_FROM_CLASS (object_class),
+                   G_OBJECT_CLASS_TYPE (object_class),
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkTextTagTableClass, tag_changed),
                    NULL,
@@ -161,8 +159,7 @@ static void
 gtk_text_tag_table_set_property (GObject      *object,
                                  guint         prop_id,
                                  const GValue *value,
-                                 GParamSpec   *pspec,
-                                 const gchar  *trailer)
+                                 GParamSpec   *pspec)
 {
   GtkTextTagTable *table;
 
@@ -182,8 +179,7 @@ static void
 gtk_text_tag_table_get_property (GObject      *object,
                                  guint         prop_id,
                                  GValue       *value,
-                                 GParamSpec   *pspec,
-                                 const gchar  *trailer)
+                                 GParamSpec   *pspec)
 {
   GtkTextTagTable *table;
 
index 27822204892e43583a8266d3c301052138ad6279..9e8027ecf02efa0a7da262253a46e9bd22815c3a 100644 (file)
@@ -540,7 +540,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, insert_at_cursor),
-                    gtk_marshal_VOID__POINTER,
+                    gtk_marshal_VOID__STRING,
                     GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
 
   signals[DELETE_FROM_CURSOR] =
@@ -588,7 +588,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, set_scroll_adjustments),
-                    gtk_marshal_VOID__POINTER_POINTER,
+                    gtk_marshal_VOID__OBJECT_OBJECT,
                     GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
   widget_class->set_scroll_adjustments_signal = signals[SET_SCROLL_ADJUSTMENTS];
 
index 92d05166f2315564572797afcd82154234bc9c28..a4f38a4630fd315110b50dcf285ab14569ff4c3f 100644 (file)
@@ -153,7 +153,7 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_entered),
-                   gtk_marshal_VOID__POINTER_STRING_STRING,
+                   gtk_marshal_VOID__OBJECT_STRING_STRING,
                    GTK_TYPE_NONE, 3,
                    GTK_TYPE_WIDGET,
                    GTK_TYPE_STRING,
@@ -163,7 +163,7 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_selected),
-                   gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER,
+                   gtk_marshal_BOOLEAN__OBJECT_STRING_STRING_BOXED,
                    GTK_TYPE_BOOL, 4,
                    GTK_TYPE_WIDGET,
                    GTK_TYPE_STRING,
index a8183ad5255fa3b6e12106dc8b2095db098acf8e..ff25b25426cd4bbe64d54ef272977909484d7679 100644 (file)
@@ -150,7 +150,7 @@ gtk_tree_class_init (GtkTreeClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, select_child),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   tree_signals[UNSELECT_CHILD] =
@@ -158,7 +158,7 @@ gtk_tree_class_init (GtkTreeClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
 }
index 66f0364cbc0cb2c94348f41184a3d7d9de1c18f3..c0ff3fb7a9f7a25b7c9818ab6d896366f495abdc 100644 (file)
@@ -18,9 +18,6 @@
  */
 
 #include "gtktreedatalist.h"
-#include "gobject/gboxed.h"
-#include "gobject/gvalue.h"
-#include "gobject/gvaluetypes.h"
 
 /* node allocation
  */
index 66fe37592026f73d1998865bbdef7c1901c834b3..cdcf602da1ed947c3701d894ae356309233c2fad 100644 (file)
@@ -22,7 +22,7 @@
 #define __GTK_TREE_DATA_LIST_H__
 
 #include <glib.h>
-#include <gobject/gobject.h>
+#include <glib-object.h>
 
 typedef struct _GtkTreeDataList GtkTreeDataList;
 struct _GtkTreeDataList
index 3ffc48c64a68bca55ddac1eef8c5132f5cb5e2c1..14f4625dd6cd5248a4f8cb56056fb0a772107cbe 100644 (file)
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include <gobject/gobject.h>
 #include <gobject/gvaluecollector.h>
-#include "gtkmarshal.h"
 #include "gtktreemodel.h"
 #include "gtktreeview.h"
 #include "gtktreeprivate.h"
+#include "gtksignal.h"
 
 
 struct _GtkTreePath
index 9478872ca10feea711a3f5a92db9229739a0fb88..aaafa5057dcfbb8c37a3f2610a2a2e121a9be41b 100644 (file)
@@ -20,7 +20,6 @@
 #ifndef __GTK_TREE_SELECTION_H__
 #define __GTK_TREE_SELECTION_H__
 
-#include <gobject/gobject.h>
 #include <gtk/gtkobject.h>
 #include <gtk/gtktreeview.h>
 
index 2a8e29054f91f4f525d0660ab1738e1f2d883bad..cfe9f9c3e0414047322b50539ad7051d4439d6c3 100644 (file)
@@ -315,14 +315,17 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
 
   class->set_scroll_adjustments = gtk_tree_view_set_adjustments;
 
+#if 0
+  /* FIXME, tim needs to support interface prerequisits in GType */
   g_object_class_install_property (o_class,
                                    PROP_MODEL,
-                                   g_param_spec_interface ("model",
-                                                          _("TreeView Model"),
-                                                          _("The model for the tree view"),
-                                                          GTK_TYPE_TREE_MODEL,
-                                                          G_PARAM_READWRITE));
-
+                                   g_param_spec_object ("model",
+                                                       _("TreeView Model"),
+                                                       _("The model for the tree view"),
+                                                       GTK_TYPE_TREE_MODEL,
+                                                       G_PARAM_READWRITE));
+#endif
+  
   g_object_class_install_property (o_class,
                                    PROP_HADJUSTMENT,
                                    g_param_spec_object ("hadjustment",
@@ -378,7 +381,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeViewClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__POINTER_POINTER,
+                   gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 }
index 5e0ed462dff828ac28b8bdd21f6be0ddeb175a3b..c5badb27ea5f34e278866d1c118b0ff2e2f220f0 100644 (file)
@@ -61,13 +61,11 @@ static void gtk_real_tree_column_clicked         (GtkTreeViewColumn      *tree_c
 static void gtk_tree_view_column_set_property    (GObject                *object,
                                                  guint                   prop_id,
                                                  const GValue           *value,
-                                                 GParamSpec             *pspec,
-                                                 const gchar            *trailer);
+                                                 GParamSpec             *pspec);
 static void gtk_tree_view_column_get_property    (GObject                *object,
                                                  guint                   prop_id,
                                                  GValue                 *value,
-                                                 GParamSpec             *pspec,
-                                                 const gchar            *trailer);
+                                                 GParamSpec             *pspec);
 static void gtk_tree_view_column_finalize        (GObject                *object);
 
 
@@ -260,8 +258,7 @@ static void
 gtk_tree_view_column_set_property (GObject         *object,
                                    guint            prop_id,
                                    const GValue    *value,
-                                   GParamSpec      *pspec,
-                                   const gchar     *trailer)
+                                   GParamSpec      *pspec)
 {
   GtkTreeViewColumn *tree_column;
 
@@ -340,8 +337,7 @@ static void
 gtk_tree_view_column_get_property (GObject         *object,
                                    guint            prop_id,
                                    GValue          *value,
-                                   GParamSpec      *pspec,
-                                   const gchar     *trailer)
+                                   GParamSpec      *pspec)
 {
   GtkTreeViewColumn *tree_column;
 
index 12b93f91e9e06373949095a4fd7a3bb08591f82a..c8385545eae748530c4c5dddcf1ae6a64592963b 100644 (file)
@@ -128,12 +128,6 @@ gtk_type_init (GTypeDebugFlags debug_flags)
   
   if (!initialized)
     {
-      static const struct {
-       GtkType type_id;
-       gchar *name;
-      } fundamental_info[] = {
-       { GTK_TYPE_SIGNAL,      "GtkSignal" },
-      };
       static struct {
        gchar              *type_name;
        GtkType            *type_id;
@@ -159,16 +153,6 @@ gtk_type_init (GTypeDebugFlags debug_flags)
        */
       gtk_object_get_type ();
 
-      /* compatibility fundamentals
-       */
-      for (i = 0; i < sizeof (fundamental_info) / sizeof (fundamental_info[0]); i++)
-       {
-         type_id = g_type_register_fundamental (fundamental_info[i].type_id,
-                                                fundamental_info[i].name,
-                                                &tinfo, &finfo, 0);
-         g_assert (type_id == fundamental_info[i].type_id);
-       }
-
       /* GTK_TYPE_IDENTIFIER
        */
       GTK_TYPE_IDENTIFIER = g_type_register_static (G_TYPE_STRING, "GtkIdentifier", &tinfo, 0);
@@ -185,10 +169,25 @@ gtk_type_init (GTypeDebugFlags debug_flags)
            type_id = g_flags_register_static (builtin_info[i].type_name, builtin_info[i].pointer1);
          else if (builtin_info[i].parent == GTK_TYPE_BOXED)
            {
+             static const gchar *copy_types[] = {
+               "GtkSelectionData", "GdkEvent", "GdkColor", "GtkTextIter", "PangoTabArray",
+               "PangoFontDescription", "GtkTreeIter", "GtkTreePath",
+             };
+             gboolean ref_counted = TRUE;
+             guint j;
+
+             for (j = 0; j < sizeof (copy_types) / sizeof (copy_types[0]); j++)
+               if (strcmp (copy_types[j], builtin_info[i].type_name) == 0)
+                 {
+                   ref_counted = FALSE;
+                   break;
+                 }
              if (builtin_info[i].pointer1 && builtin_info[i].pointer2)
                type_id = g_boxed_type_register_static (builtin_info[i].type_name,
+                                                       NULL,
                                                        builtin_info[i].pointer1,
-                                                       builtin_info[i].pointer2);
+                                                       builtin_info[i].pointer2,
+                                                       ref_counted);
              else
                type_id = g_type_register_static (GTK_TYPE_BOXED, builtin_info[i].type_name, &tinfo, 0);
            }
index d8d6b9c42bea37983c437c3502dc3bebcd5cef63..ed6ff88e5af8c47d1151913cc58f60f963539cd7 100644 (file)
@@ -59,8 +59,7 @@ typedef enum  /*< skip >*/
   GTK_TYPE_DOUBLE      = G_TYPE_DOUBLE,
   GTK_TYPE_STRING      = G_TYPE_STRING,
   GTK_TYPE_BOXED       = G_TYPE_BOXED,
-  GTK_TYPE_POINTER     = G_TYPE_POINTER,
-  GTK_TYPE_SIGNAL      = G_TYPE_GTK_SIGNAL
+  GTK_TYPE_POINTER     = G_TYPE_POINTER
 } GtkFundamentalType;
 
 
index 011636dfb43210055e295f8e4fa3ac1752f6e32f..c79af9af3b3261ddf68b8d68fd28bc48cd4e0156 100644 (file)
@@ -142,7 +142,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkViewportClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__POINTER_POINTER,
+                   gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 }
 
index 56f8664d86b3eb472c0c97540942304e736e7a1b..a6fb15de358694d0082defaabcdd26dec86f9142 100644 (file)
@@ -98,7 +98,6 @@ enum {
   NO_EXPOSE_EVENT,
   VISIBILITY_NOTIFY_EVENT,
   WINDOW_STATE_EVENT,
-  DEBUG_MSG,
   LAST_SIGNAL
 };
 
@@ -258,14 +257,6 @@ gtk_widget_get_type (void)
  *
  *   results:
  *****************************************/
-#include "stdio.h"
-static void
-gtk_widget_debug_msg (GtkWidget          *widget,
-                     const gchar        *string)
-{
-  fprintf (stderr, "Gtk-DEBUG: %s\n", string);
-}
-
 static void
 gtk_widget_class_init (GtkWidgetClass *klass)
 {
@@ -334,8 +325,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
 
   klass->no_expose_event = NULL;
 
-  klass->debug_msg = gtk_widget_debug_msg;
-  
   gtk_object_add_arg_type ("GtkWidget::name", GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NAME);
   gtk_object_add_arg_type ("GtkWidget::parent", GTK_TYPE_CONTAINER, GTK_ARG_READWRITE, ARG_PARENT);
   gtk_object_add_arg_type ("GtkWidget::x", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_X);
@@ -426,7 +415,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, parent_set),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_OBJECT);
   widget_signals[STYLE_SET] =
@@ -434,7 +423,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, style_set),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STYLE);
   widget_signals[DIRECTION_CHANGED] =
@@ -463,7 +452,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                   gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[BUTTON_PRESS_EVENT] =
@@ -471,7 +460,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, button_press_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                   gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[BUTTON_RELEASE_EVENT] =
@@ -479,7 +468,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, button_release_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                   gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[SCROLL_EVENT] =
@@ -487,7 +476,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, scroll_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[MOTION_NOTIFY_EVENT] =
@@ -495,7 +484,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, motion_notify_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[DELETE_EVENT] =
@@ -503,7 +492,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, delete_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[DESTROY_EVENT] =
@@ -511,7 +500,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, destroy_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[EXPOSE_EVENT] =
@@ -519,7 +508,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, expose_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[KEY_PRESS_EVENT] =
@@ -527,7 +516,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, key_press_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[KEY_RELEASE_EVENT] =
@@ -535,7 +524,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, key_release_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[ENTER_NOTIFY_EVENT] =
@@ -543,7 +532,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, enter_notify_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[LEAVE_NOTIFY_EVENT] =
@@ -551,7 +540,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, leave_notify_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[CONFIGURE_EVENT] =
@@ -559,7 +548,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, configure_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[FOCUS_IN_EVENT] =
@@ -567,7 +556,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, focus_in_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[FOCUS_OUT_EVENT] =
@@ -575,7 +564,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, focus_out_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[MAP_EVENT] =
@@ -583,7 +572,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, map_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[UNMAP_EVENT] =
@@ -591,7 +580,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[PROPERTY_NOTIFY_EVENT] =
@@ -599,7 +588,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, property_notify_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[SELECTION_CLEAR_EVENT] =
@@ -607,7 +596,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_clear_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[SELECTION_REQUEST_EVENT] =
@@ -615,7 +604,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_request_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[SELECTION_NOTIFY_EVENT] =
@@ -623,7 +612,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_notify_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[SELECTION_RECEIVED] =
@@ -631,7 +620,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_received),
-                   gtk_marshal_VOID__POINTER_UINT,
+                   gtk_marshal_VOID__BOXED_UINT,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_SELECTION_DATA,
                    GTK_TYPE_UINT);
@@ -640,7 +629,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_get),
-                   gtk_marshal_VOID__POINTER_UINT_UINT,
+                   gtk_marshal_VOID__BOXED_UINT_UINT,
                    GTK_TYPE_NONE, 3,
                    GTK_TYPE_SELECTION_DATA,
                    GTK_TYPE_UINT,
@@ -650,7 +639,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, proximity_in_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[PROXIMITY_OUT_EVENT] =
@@ -658,7 +647,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, proximity_out_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[DRAG_LEAVE] =
@@ -666,7 +655,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_leave),
-                   gtk_marshal_VOID__POINTER_UINT,
+                   gtk_marshal_VOID__BOXED_UINT,
                    GTK_TYPE_NONE, 2,
                    GDK_TYPE_DRAG_CONTEXT,
                    GTK_TYPE_UINT);
@@ -675,7 +664,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__BOXED,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_END] =
@@ -683,7 +672,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__BOXED,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_DATA_DELETE] =
@@ -691,7 +680,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_delete),
-                   gtk_marshal_VOID__POINTER,
+                   gtk_marshal_VOID__BOXED,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_MOTION] =
@@ -699,7 +688,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_motion),
-                   gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT,
+                   gtk_marshal_BOOLEAN__BOXED_INT_INT_UINT,
                    GTK_TYPE_BOOL, 4,
                    GDK_TYPE_DRAG_CONTEXT,
                    GTK_TYPE_INT,
@@ -710,7 +699,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_drop),
-                   gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT,
+                   gtk_marshal_BOOLEAN__BOXED_INT_INT_UINT,
                    GTK_TYPE_BOOL, 4,
                    GDK_TYPE_DRAG_CONTEXT,
                    GTK_TYPE_INT,
@@ -721,7 +710,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_get),
-                   gtk_marshal_VOID__POINTER_POINTER_UINT_UINT,
+                   gtk_marshal_VOID__BOXED_BOXED_UINT_UINT,
                    GTK_TYPE_NONE, 4,
                    GDK_TYPE_DRAG_CONTEXT,
                    GTK_TYPE_SELECTION_DATA,
@@ -732,7 +721,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received),
-                   gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT,
+                   gtk_marshal_VOID__BOXED_INT_INT_BOXED_UINT_UINT,
                    GTK_TYPE_NONE, 6,
                    GDK_TYPE_DRAG_CONTEXT,
                    GTK_TYPE_INT,
@@ -745,7 +734,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, visibility_notify_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[CLIENT_EVENT] =
@@ -753,7 +742,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, client_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[NO_EXPOSE_EVENT] =
@@ -761,7 +750,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, no_expose_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[WINDOW_STATE_EVENT] =
@@ -769,17 +758,9 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, window_state_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                    gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
-  widget_signals[DEBUG_MSG] =
-    gtk_signal_new ("debug_msg",
-                   GTK_RUN_LAST | GTK_RUN_ACTION,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, debug_msg),
-                   gtk_marshal_VOID__POINTER,
-                   GTK_TYPE_NONE, 1,
-                   GTK_TYPE_STRING);
 }
 
 static void
index b3497aac8fc296431b14eec9c31929a456dba2d9..d3af4c4a8f8be471f3388fe5576ae2ee0bb13a3f 100644 (file)
@@ -370,10 +370,6 @@ struct _GtkWidgetClass
                                    guint               info,
                                    guint               time);
   
-  /* action signals */
-  void (* debug_msg)              (GtkWidget          *widget,
-                                   const gchar        *string);
-
   /* Padding for future expandsion */
   GtkFunction pad1;
   GtkFunction pad2;
index 3d632f5fa259ff0cbc9323a9f558b59848945a52..710a5e32adebf105089e804707cee39b7b832fba 100644 (file)
@@ -272,7 +272,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                     GTK_RUN_LAST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkWindowClass, set_focus),
-                    gtk_marshal_VOID__POINTER,
+                    gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_WIDGET);
   
@@ -281,7 +281,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWindowClass, frame_event),
-                   gtk_marshal_BOOLEAN__POINTER,
+                   gtk_marshal_BOOLEAN__BOXED,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
 }
index 450b3906c273ff77a9d58001cf46d1aab0f71fb8..9e57e357aca1c8c3cb615681e4e499a4786f6dcf 100644 (file)
@@ -16,22 +16,24 @@ main (int argc, char *argv[])
   /* FIXME: This is not allowable - what is this supposed to be? */
   /*  gdk_progclass = g_strdup ("XTerm"); */
   gtk_init (&argc, &argv);
-
-  window = gtk_widget_new (gtk_window_get_type (),
-                          "GtkObject::user_data", NULL,
-                          "GtkObject::signal::destroy", gtk_main_quit, NULL,
-                          "GtkWindow::type", GTK_WINDOW_TOPLEVEL,
-                          "GtkWindow::title", "hello world",
-                          "GtkWindow::allow_grow", FALSE,
-                          "GtkWindow::allow_shrink", FALSE,
-                          "GtkContainer::border_width", 10,
-                          NULL);
-  button = gtk_widget_new (gtk_button_get_type (),
-                          "GtkButton::label", "hello world",
-                          "GtkObject::signal::clicked", hello, NULL,
-                          "GtkWidget::parent", window,
-                          "GtkWidget::visible", TRUE,
-                          NULL);
+  
+  window = g_object_connect (gtk_widget_new (gtk_window_get_type (),
+                                            "user_data", NULL,
+                                            "type", GTK_WINDOW_TOPLEVEL,
+                                            "title", "hello world",
+                                            "allow_grow", FALSE,
+                                            "allow_shrink", FALSE,
+                                            "border_width", 10,
+                                            NULL),
+                            "signal::destroy", gtk_main_quit, NULL,
+                            NULL);
+  button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                            "GtkButton::label", "hello world",
+                                            "GtkWidget::parent", window,
+                                            "GtkWidget::visible", TRUE,
+                                            NULL),
+                            "signal::clicked", hello, NULL,
+                            NULL);
   gtk_widget_show (window);
 
   gtk_main ();
index 553f606ec0b205f741ee100d5c14fcd9ff220da0..8b06fe0b3844c80e60f167205f6c2da0b88257ee 100644 (file)
@@ -1022,37 +1022,34 @@ create_statusbar (void)
                               "visible", TRUE,
                               "parent", box2,
                               NULL);
-      g_object_set (G_OBJECT (button),
-                   "signal::clicked", statusbar_push, statusbar,
-                   NULL);
-
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "pop",
-                              "visible", TRUE,
-                              "parent", box2,
-                              NULL);
-      g_object_set (G_OBJECT (button),
-                   "signal_after::clicked", statusbar_pop, statusbar,
-                   NULL);
+      g_object_connect (G_OBJECT (button),
+                       "signal::clicked", statusbar_push, statusbar,
+                       NULL);
 
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "steal #4",
-                              "visible", TRUE,
-                              "parent", box2,
-                              NULL);
-      g_object_set (G_OBJECT (button),
-                   "signal_after::clicked", statusbar_steal, statusbar,
-                   NULL);
+      button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                                "label", "pop",
+                                                "visible", TRUE,
+                                                "parent", box2,
+                                                NULL),
+                                "signal_after::clicked", statusbar_pop, statusbar,
+                                NULL);
 
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "test contexts",
-                              "visible", TRUE,
-                              "parent", box2,
-                              NULL);
-      g_object_set (G_OBJECT (button),
-                   "swapped_signal_after::clicked", statusbar_contexts, statusbar,
-                   NULL);
+      button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                                "label", "steal #4",
+                                                "visible", TRUE,
+                                                "parent", box2,
+                                                NULL),
+                                "signal_after::clicked", statusbar_steal, statusbar,
+                                NULL);
 
+      button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                                "label", "test contexts",
+                                                "visible", TRUE,
+                                                "parent", box2,
+                                                NULL),
+                                "swapped_signal_after::clicked", statusbar_contexts, statusbar,
+                                NULL);
+      
       separator = gtk_hseparator_new ();
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
@@ -2386,13 +2383,14 @@ create_saved_position (void)
       GtkWidget *label;
       GtkWidget *any;
 
-      window = gtk_widget_new (GTK_TYPE_WINDOW,
-                              "type", GTK_WINDOW_TOPLEVEL,
-                              "signal::configure_event", uposition_configure, NULL,
-                              "x", upositionx,
-                              "y", upositiony,
-                              "title", "Saved Position",
-                              NULL);
+      window = g_object_connect (gtk_widget_new (GTK_TYPE_WINDOW,
+                                                "type", GTK_WINDOW_TOPLEVEL,
+                                                "x", upositionx,
+                                                "y", upositiony,
+                                                "title", "Saved Position",
+                                                NULL),
+                                "signal::configure_event", uposition_configure, NULL,
+                                NULL);
 
       gtk_signal_connect (GTK_OBJECT (window), "destroy",
                          GTK_SIGNAL_FUNC (gtk_widget_destroyed),
@@ -2409,12 +2407,13 @@ create_saved_position (void)
                        "GtkContainer::border_width", 10,
                        "GtkWidget::parent", main_vbox,
                        "GtkWidget::visible", TRUE,
-                       "child", gtk_widget_new (GTK_TYPE_TOGGLE_BUTTON,
-                                                "label", "Stop Events",
-                                                "active", FALSE,
-                                                "signal::clicked", uposition_stop_configure, window,
-                                                "visible", TRUE,
-                                                NULL),
+                       "child", g_object_connect (gtk_widget_new (GTK_TYPE_TOGGLE_BUTTON,
+                                                                  "label", "Stop Events",
+                                                                  "active", FALSE,
+                                                                  "visible", TRUE,
+                                                                  NULL),
+                                                  "signal::clicked", uposition_stop_configure, window,
+                                                  NULL),
                        NULL);
 
       hbox = gtk_hbox_new (FALSE, 0);
@@ -2639,23 +2638,23 @@ create_tooltips (void)
 
       box3 =
        gtk_widget_new (gtk_vbox_get_type (),
-                       "GtkBox::homogeneous", FALSE,
-                       "GtkBox::spacing", 5,
-                       "GtkContainer::border_width", 5,
-                       "GtkWidget::visible", TRUE,
+                       "homogeneous", FALSE,
+                       "spacing", 5,
+                       "border_width", 5,
+                       "visible", TRUE,
                        NULL);
 
       tips_query = gtk_tips_query_new ();
 
       button =
        gtk_widget_new (gtk_button_get_type (),
-                       "GtkButton::label", "[?]",
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box3,
+                       "label", "[?]",
+                       "visible", TRUE,
+                       "parent", box3,
+                       NULL);
+      g_object_connect (G_OBJECT (button),
+                       "swapped_signal::clicked", gtk_tips_query_start_query, tips_query,
                        NULL);
-      g_object_set (G_OBJECT (button),
-                   "swapped_signal::clicked", gtk_tips_query_start_query, tips_query,
-                   NULL);
       gtk_box_set_child_packing (GTK_BOX (box3), button, FALSE, FALSE, 0, GTK_PACK_START);
       gtk_tooltips_set_tip (tooltips,
                            button,
@@ -2663,23 +2662,23 @@ create_tooltips (void)
                            "ContextHelp/buttons/?");
       
       
-      gtk_widget_set (tips_query,
-                     "GtkWidget::visible", TRUE,
-                     "GtkWidget::parent", box3,
-                     "GtkTipsQuery::caller", button,
-                     "GtkObject::signal::widget_entered", tips_query_widget_entered, toggle,
-                     "GtkObject::signal::widget_selected", tips_query_widget_selected, NULL,
+      gtk_widget_set (g_object_connect (tips_query,
+                                       "signal::widget_entered", tips_query_widget_entered, toggle,
+                                       "signal::widget_selected", tips_query_widget_selected, NULL,
+                                       NULL),
+                     "visible", TRUE,
+                     "parent", box3,
+                     "caller", button,
                      NULL);
       
-      frame =
-       gtk_widget_new (gtk_frame_get_type (),
-                       "GtkFrame::label", "ToolTips Inspector",
-                       "GtkFrame::label_xalign", (double) 0.5,
-                       "GtkContainer::border_width", 0,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box2,
-                       "GtkContainer::child", box3,
-                       NULL);
+      frame = gtk_widget_new (gtk_frame_get_type (),
+                             "label", "ToolTips Inspector",
+                             "label_xalign", (double) 0.5,
+                             "border_width", 0,
+                             "visible", TRUE,
+                             "parent", box2,
+                             "child", box3,
+                             NULL);
       gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, TRUE, 10, GTK_PACK_START);
 
       separator = gtk_hseparator_new ();
@@ -9075,11 +9074,11 @@ create_idle_test (void)
       
       container =
        gtk_widget_new (GTK_TYPE_HBOX,
-                       "GtkWidget::visible", TRUE,
+                       "visible", TRUE,
                        /* "GtkContainer::child", gtk_widget_new (GTK_TYPE_HBOX,
                         * "GtkWidget::visible", TRUE,
                         */
-                        "GtkContainer::child", label,
+                        "child", label,
                        /* NULL), */
                        NULL);
       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), 
@@ -9087,43 +9086,46 @@ create_idle_test (void)
 
       frame =
        gtk_widget_new (GTK_TYPE_FRAME,
-                       "GtkContainer::border_width", 5,
-                       "GtkFrame::label", "Label Container",
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", GTK_DIALOG (window)->vbox,
+                       "border_width", 5,
+                       "label", "Label Container",
+                       "visible", TRUE,
+                       "parent", GTK_DIALOG (window)->vbox,
                        NULL);
       box =
        gtk_widget_new (GTK_TYPE_VBOX,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", frame,
+                       "visible", TRUE,
+                       "parent", frame,
                        NULL);
       button =
-       gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
-                       "GtkButton::label", "Resize-Parent",
-                       "GtkObject::user_data", (void*)GTK_RESIZE_PARENT,
-                       "GtkObject::signal::clicked", toggle_idle_container, container,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box,
-                       NULL);
+       g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
+                                         "label", "Resize-Parent",
+                                         "user_data", (void*)GTK_RESIZE_PARENT,
+                                         "visible", TRUE,
+                                         "parent", box,
+                                         NULL),
+                         "signal::clicked", toggle_idle_container, container,
+                         NULL);
       button =
-       gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
-                       "GtkButton::label", "Resize-Queue",
-                       "GtkObject::user_data", (void*)GTK_RESIZE_QUEUE,
-                       "GtkObject::signal::clicked", toggle_idle_container, container,
-                       "GtkRadioButton::group", button,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box,
-                       NULL);
+       g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
+                                         "label", "Resize-Queue",
+                                         "user_data", (void*)GTK_RESIZE_QUEUE,
+                                         "group", button,
+                                         "visible", TRUE,
+                                         "parent", box,
+                                         NULL),
+                         "signal::clicked", toggle_idle_container, container,
+                         NULL);
       button =
-       gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
-                       "GtkButton::label", "Resize-Immediate",
-                       "GtkObject::user_data", (void*)GTK_RESIZE_IMMEDIATE,
-                       "GtkObject::signal::clicked", toggle_idle_container, container,
-                       "GtkRadioButton::group", button,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box,
-                       NULL);
-      
+       g_object_set (g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
+                                                       "label", "Resize-Immediate",
+                                                       "user_data", (void*)GTK_RESIZE_IMMEDIATE,
+                                                       NULL),
+                                       "signal::clicked", toggle_idle_container, container,
+                                       NULL),
+                     "group", button,
+                     "visible", TRUE,
+                     "parent", box,
+                     NULL);
 
       button = gtk_button_new_with_label ("close");
       gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
index 450b3906c273ff77a9d58001cf46d1aab0f71fb8..9e57e357aca1c8c3cb615681e4e499a4786f6dcf 100644 (file)
@@ -16,22 +16,24 @@ main (int argc, char *argv[])
   /* FIXME: This is not allowable - what is this supposed to be? */
   /*  gdk_progclass = g_strdup ("XTerm"); */
   gtk_init (&argc, &argv);
-
-  window = gtk_widget_new (gtk_window_get_type (),
-                          "GtkObject::user_data", NULL,
-                          "GtkObject::signal::destroy", gtk_main_quit, NULL,
-                          "GtkWindow::type", GTK_WINDOW_TOPLEVEL,
-                          "GtkWindow::title", "hello world",
-                          "GtkWindow::allow_grow", FALSE,
-                          "GtkWindow::allow_shrink", FALSE,
-                          "GtkContainer::border_width", 10,
-                          NULL);
-  button = gtk_widget_new (gtk_button_get_type (),
-                          "GtkButton::label", "hello world",
-                          "GtkObject::signal::clicked", hello, NULL,
-                          "GtkWidget::parent", window,
-                          "GtkWidget::visible", TRUE,
-                          NULL);
+  
+  window = g_object_connect (gtk_widget_new (gtk_window_get_type (),
+                                            "user_data", NULL,
+                                            "type", GTK_WINDOW_TOPLEVEL,
+                                            "title", "hello world",
+                                            "allow_grow", FALSE,
+                                            "allow_shrink", FALSE,
+                                            "border_width", 10,
+                                            NULL),
+                            "signal::destroy", gtk_main_quit, NULL,
+                            NULL);
+  button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                            "GtkButton::label", "hello world",
+                                            "GtkWidget::parent", window,
+                                            "GtkWidget::visible", TRUE,
+                                            NULL),
+                            "signal::clicked", hello, NULL,
+                            NULL);
   gtk_widget_show (window);
 
   gtk_main ();
index 553f606ec0b205f741ee100d5c14fcd9ff220da0..8b06fe0b3844c80e60f167205f6c2da0b88257ee 100644 (file)
@@ -1022,37 +1022,34 @@ create_statusbar (void)
                               "visible", TRUE,
                               "parent", box2,
                               NULL);
-      g_object_set (G_OBJECT (button),
-                   "signal::clicked", statusbar_push, statusbar,
-                   NULL);
-
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "pop",
-                              "visible", TRUE,
-                              "parent", box2,
-                              NULL);
-      g_object_set (G_OBJECT (button),
-                   "signal_after::clicked", statusbar_pop, statusbar,
-                   NULL);
+      g_object_connect (G_OBJECT (button),
+                       "signal::clicked", statusbar_push, statusbar,
+                       NULL);
 
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "steal #4",
-                              "visible", TRUE,
-                              "parent", box2,
-                              NULL);
-      g_object_set (G_OBJECT (button),
-                   "signal_after::clicked", statusbar_steal, statusbar,
-                   NULL);
+      button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                                "label", "pop",
+                                                "visible", TRUE,
+                                                "parent", box2,
+                                                NULL),
+                                "signal_after::clicked", statusbar_pop, statusbar,
+                                NULL);
 
-      button = gtk_widget_new (gtk_button_get_type (),
-                              "label", "test contexts",
-                              "visible", TRUE,
-                              "parent", box2,
-                              NULL);
-      g_object_set (G_OBJECT (button),
-                   "swapped_signal_after::clicked", statusbar_contexts, statusbar,
-                   NULL);
+      button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                                "label", "steal #4",
+                                                "visible", TRUE,
+                                                "parent", box2,
+                                                NULL),
+                                "signal_after::clicked", statusbar_steal, statusbar,
+                                NULL);
 
+      button = g_object_connect (gtk_widget_new (gtk_button_get_type (),
+                                                "label", "test contexts",
+                                                "visible", TRUE,
+                                                "parent", box2,
+                                                NULL),
+                                "swapped_signal_after::clicked", statusbar_contexts, statusbar,
+                                NULL);
+      
       separator = gtk_hseparator_new ();
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
@@ -2386,13 +2383,14 @@ create_saved_position (void)
       GtkWidget *label;
       GtkWidget *any;
 
-      window = gtk_widget_new (GTK_TYPE_WINDOW,
-                              "type", GTK_WINDOW_TOPLEVEL,
-                              "signal::configure_event", uposition_configure, NULL,
-                              "x", upositionx,
-                              "y", upositiony,
-                              "title", "Saved Position",
-                              NULL);
+      window = g_object_connect (gtk_widget_new (GTK_TYPE_WINDOW,
+                                                "type", GTK_WINDOW_TOPLEVEL,
+                                                "x", upositionx,
+                                                "y", upositiony,
+                                                "title", "Saved Position",
+                                                NULL),
+                                "signal::configure_event", uposition_configure, NULL,
+                                NULL);
 
       gtk_signal_connect (GTK_OBJECT (window), "destroy",
                          GTK_SIGNAL_FUNC (gtk_widget_destroyed),
@@ -2409,12 +2407,13 @@ create_saved_position (void)
                        "GtkContainer::border_width", 10,
                        "GtkWidget::parent", main_vbox,
                        "GtkWidget::visible", TRUE,
-                       "child", gtk_widget_new (GTK_TYPE_TOGGLE_BUTTON,
-                                                "label", "Stop Events",
-                                                "active", FALSE,
-                                                "signal::clicked", uposition_stop_configure, window,
-                                                "visible", TRUE,
-                                                NULL),
+                       "child", g_object_connect (gtk_widget_new (GTK_TYPE_TOGGLE_BUTTON,
+                                                                  "label", "Stop Events",
+                                                                  "active", FALSE,
+                                                                  "visible", TRUE,
+                                                                  NULL),
+                                                  "signal::clicked", uposition_stop_configure, window,
+                                                  NULL),
                        NULL);
 
       hbox = gtk_hbox_new (FALSE, 0);
@@ -2639,23 +2638,23 @@ create_tooltips (void)
 
       box3 =
        gtk_widget_new (gtk_vbox_get_type (),
-                       "GtkBox::homogeneous", FALSE,
-                       "GtkBox::spacing", 5,
-                       "GtkContainer::border_width", 5,
-                       "GtkWidget::visible", TRUE,
+                       "homogeneous", FALSE,
+                       "spacing", 5,
+                       "border_width", 5,
+                       "visible", TRUE,
                        NULL);
 
       tips_query = gtk_tips_query_new ();
 
       button =
        gtk_widget_new (gtk_button_get_type (),
-                       "GtkButton::label", "[?]",
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box3,
+                       "label", "[?]",
+                       "visible", TRUE,
+                       "parent", box3,
+                       NULL);
+      g_object_connect (G_OBJECT (button),
+                       "swapped_signal::clicked", gtk_tips_query_start_query, tips_query,
                        NULL);
-      g_object_set (G_OBJECT (button),
-                   "swapped_signal::clicked", gtk_tips_query_start_query, tips_query,
-                   NULL);
       gtk_box_set_child_packing (GTK_BOX (box3), button, FALSE, FALSE, 0, GTK_PACK_START);
       gtk_tooltips_set_tip (tooltips,
                            button,
@@ -2663,23 +2662,23 @@ create_tooltips (void)
                            "ContextHelp/buttons/?");
       
       
-      gtk_widget_set (tips_query,
-                     "GtkWidget::visible", TRUE,
-                     "GtkWidget::parent", box3,
-                     "GtkTipsQuery::caller", button,
-                     "GtkObject::signal::widget_entered", tips_query_widget_entered, toggle,
-                     "GtkObject::signal::widget_selected", tips_query_widget_selected, NULL,
+      gtk_widget_set (g_object_connect (tips_query,
+                                       "signal::widget_entered", tips_query_widget_entered, toggle,
+                                       "signal::widget_selected", tips_query_widget_selected, NULL,
+                                       NULL),
+                     "visible", TRUE,
+                     "parent", box3,
+                     "caller", button,
                      NULL);
       
-      frame =
-       gtk_widget_new (gtk_frame_get_type (),
-                       "GtkFrame::label", "ToolTips Inspector",
-                       "GtkFrame::label_xalign", (double) 0.5,
-                       "GtkContainer::border_width", 0,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box2,
-                       "GtkContainer::child", box3,
-                       NULL);
+      frame = gtk_widget_new (gtk_frame_get_type (),
+                             "label", "ToolTips Inspector",
+                             "label_xalign", (double) 0.5,
+                             "border_width", 0,
+                             "visible", TRUE,
+                             "parent", box2,
+                             "child", box3,
+                             NULL);
       gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, TRUE, 10, GTK_PACK_START);
 
       separator = gtk_hseparator_new ();
@@ -9075,11 +9074,11 @@ create_idle_test (void)
       
       container =
        gtk_widget_new (GTK_TYPE_HBOX,
-                       "GtkWidget::visible", TRUE,
+                       "visible", TRUE,
                        /* "GtkContainer::child", gtk_widget_new (GTK_TYPE_HBOX,
                         * "GtkWidget::visible", TRUE,
                         */
-                        "GtkContainer::child", label,
+                        "child", label,
                        /* NULL), */
                        NULL);
       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), 
@@ -9087,43 +9086,46 @@ create_idle_test (void)
 
       frame =
        gtk_widget_new (GTK_TYPE_FRAME,
-                       "GtkContainer::border_width", 5,
-                       "GtkFrame::label", "Label Container",
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", GTK_DIALOG (window)->vbox,
+                       "border_width", 5,
+                       "label", "Label Container",
+                       "visible", TRUE,
+                       "parent", GTK_DIALOG (window)->vbox,
                        NULL);
       box =
        gtk_widget_new (GTK_TYPE_VBOX,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", frame,
+                       "visible", TRUE,
+                       "parent", frame,
                        NULL);
       button =
-       gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
-                       "GtkButton::label", "Resize-Parent",
-                       "GtkObject::user_data", (void*)GTK_RESIZE_PARENT,
-                       "GtkObject::signal::clicked", toggle_idle_container, container,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box,
-                       NULL);
+       g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
+                                         "label", "Resize-Parent",
+                                         "user_data", (void*)GTK_RESIZE_PARENT,
+                                         "visible", TRUE,
+                                         "parent", box,
+                                         NULL),
+                         "signal::clicked", toggle_idle_container, container,
+                         NULL);
       button =
-       gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
-                       "GtkButton::label", "Resize-Queue",
-                       "GtkObject::user_data", (void*)GTK_RESIZE_QUEUE,
-                       "GtkObject::signal::clicked", toggle_idle_container, container,
-                       "GtkRadioButton::group", button,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box,
-                       NULL);
+       g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
+                                         "label", "Resize-Queue",
+                                         "user_data", (void*)GTK_RESIZE_QUEUE,
+                                         "group", button,
+                                         "visible", TRUE,
+                                         "parent", box,
+                                         NULL),
+                         "signal::clicked", toggle_idle_container, container,
+                         NULL);
       button =
-       gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
-                       "GtkButton::label", "Resize-Immediate",
-                       "GtkObject::user_data", (void*)GTK_RESIZE_IMMEDIATE,
-                       "GtkObject::signal::clicked", toggle_idle_container, container,
-                       "GtkRadioButton::group", button,
-                       "GtkWidget::visible", TRUE,
-                       "GtkWidget::parent", box,
-                       NULL);
-      
+       g_object_set (g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON,
+                                                       "label", "Resize-Immediate",
+                                                       "user_data", (void*)GTK_RESIZE_IMMEDIATE,
+                                                       NULL),
+                                       "signal::clicked", toggle_idle_container, container,
+                                       NULL),
+                     "group", button,
+                     "visible", TRUE,
+                     "parent", box,
+                     NULL);
 
       button = gtk_button_new_with_label ("close");
       gtk_signal_connect_object (GTK_OBJECT (button), "clicked",