X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbuildable.c;h=8867cfd333d41d5eba01ceb227595ab776b41af6;hb=feb64f40b0f50735104da0a7fdafbe480763c180;hp=68e6f8f89c4207fa10452da4bd963f6a870954fa;hpb=51e32fe67ab36fe92f727c6e9521168ee9ec93ec;p=~andy%2Fgtk
diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index 68e6f8f89..8867cfd33 100644
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -13,9 +13,7 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/**
@@ -23,24 +21,24 @@
* @Short_description: Interface for objects that can be built by GtkBuilder
* @Title: GtkBuildable
*
- * In order to allow construction from a GtkBuilder
- * UI description, an object class must implement the
- * GtkBuildable interface. The interface includes methods for setting
- * names and properties of objects, parsing custom tags, constructing
- * child objects.
+ * GtkBuildable allows objects to extend and customize their deserialization
+ * from GtkBuilder UI descriptions.
+ * The interface includes methods for setting names and properties of objects,
+ * parsing custom tags and constructing child objects.
*
* The GtkBuildable interface is implemented by all widgets and
* many of the non-widget objects that are provided by GTK+. The
- * main user of this interface is #GtkBuilder, there should be
+ * main user of this interface is #GtkBuilder. There should be
* very little need for applications to call any
* gtk_buildable_... functions.
+ *
+ * An object only needs to implement this interface if it needs
+ * to extend the #GtkBuilder format or run any extra routines at deserialization time
*/
#include "config.h"
#include "gtkbuildable.h"
-#include "gtktypeutils.h"
#include "gtkintl.h"
-#include "gtkalias.h"
typedef GtkBuildableIface GtkBuildableInterface;
@@ -86,7 +84,7 @@ gtk_buildable_set_name (GtkBuildable *buildable,
*
* Gets the name of the @buildable object.
*
- * #GtkBuilder sets the name based on the the
+ * #GtkBuilder sets the name based on the
* GtkBuilder UI definition
* used to construct the @buildable.
*
@@ -203,12 +201,12 @@ gtk_buildable_parser_finished (GtkBuildable *buildable,
* @builder: #GtkBuilder used to construct this object
* @name: name of child to construct
*
- * Constructs a child of @buildable with the name @name.
+ * Constructs a child of @buildable with the name @name.
*
* #GtkBuilder calls this function if a "constructor" has been
* specified in the UI definition.
*
- * Returns: the constructed child
+ * Returns: (transfer full): the constructed child
*
* Since: 2.12
**/
@@ -235,8 +233,8 @@ gtk_buildable_construct_child (GtkBuildable *buildable,
* @builder: a #GtkBuilder used to construct this object
* @child: (allow-none): child object or %NULL for non-child tags
* @tagname: name of tag
- * @parser: a #GMarkupParser structure to fill in
- * @data: return location for user data that will be passed in
+ * @parser: (out): a #GMarkupParser structure to fill in
+ * @data: (out): return location for user data that will be passed in
* to parser functions
*
* This is called for each unknown element under <child>.
@@ -273,7 +271,7 @@ gtk_buildable_custom_tag_start (GtkBuildable *buildable,
* @builder: #GtkBuilder used to construct this object
* @child: (allow-none): child object or %NULL for non-child tags
* @tagname: name of tag
- * @data: user data that will be passed in to parser functions
+ * @data: (type gpointer): user data that will be passed in to parser functions
*
* This is called at the end of each custom element handled by
* the buildable.
@@ -336,7 +334,7 @@ gtk_buildable_custom_finished (GtkBuildable *buildable,
*
* Get the internal child called @childname of the @buildable object.
*
- * Returns: the internal child of the buildable object
+ * Returns: (transfer none): the internal child of the buildable object
*
* Since: 2.12
**/
@@ -357,6 +355,3 @@ gtk_buildable_get_internal_child (GtkBuildable *buildable,
return (* iface->get_internal_child) (buildable, builder, childname);
}
-
-#define __GTK_BUILDABLE_C__
-#include "gtkaliasdef.c"