Documentation fixes

[~andy/gtk] / gtk / gtkbuilderprivate.h

diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h
index 1a45aca2369d2f754c3efb223ea44cea3f1adb60..8c69630d6c91f93e29544ac9432f276a0a8d2d8e 100644 (file)
--- a/gtk/gtkbuilderprivate.h
+++ b/gtk/gtkbuilderprivate.h
@@ -21,10 +21,6 @@
 #ifndef __GTK_BUILDER_PRIVATE_H__
 #define __GTK_BUILDER_PRIVATE_H__
 
-#include <glib/gmarkup.h>
-#include <glib/gslist.h>
-
-#include <glib-object.h>
 #include "gtkbuilder.h"
 
 typedef struct {
@@ -74,6 +70,13 @@ typedef struct {
   gchar *connect_object_name;
 } SignalInfo;
 
+typedef struct {
+  TagInfo  tag;
+  gchar   *library;
+  gint     major;
+  gint     minor;
+} RequiresInfo;
+
 typedef struct {
   GMarkupParser *parser;
   gchar *tagname;
@@ -93,6 +96,11 @@ typedef struct {
   const gchar *filename;
   GSList *finalizers;
   GSList *custom_finalizers;
+
+  GSList *requested_objects; /* NULL if all the objects are requested */
+  gboolean inside_requested_object;
+  gint requested_object_level;
+  gint cur_object_level;
 } ParserData;
 
 typedef GType (*GTypeGetFunc) (void);
@@ -102,6 +110,7 @@ void _gtk_builder_parser_parse_buffer (GtkBuilder *builder,
                                        const gchar *filename,
                                        const gchar *buffer,
                                        gsize length,
+                                       gchar **requested_objs,
                                        GError **error);
 GObject * _gtk_builder_construct (GtkBuilder *builder,
                                   ObjectInfo *info,
@@ -118,6 +127,10 @@ void _free_signal_info (SignalInfo *info,
 gboolean _gtk_builder_boolean_from_string (const gchar  *string,
                                           gboolean     *value,
                                           GError      **error);
+gboolean _gtk_builder_enum_from_string (GType         type,
+                                        const gchar  *string,
+                                        gint         *enum_value,
+                                        GError      **error);
 gboolean  _gtk_builder_flags_from_string (GType       type,
                                          const char *string,
                                          guint      *value,
@@ -125,5 +138,7 @@ gboolean  _gtk_builder_flags_from_string (GType       type,
 gchar * _gtk_builder_parser_translate (const gchar *domain,
                                       const gchar *context,
                                       const gchar *text);
+gchar *   _gtk_builder_get_absolute_filename (GtkBuilder *builder,
+                                             const gchar *string);
 
 #endif /* __GTK_BUILDER_PRIVATE_H__ */