X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbuilder.h;h=31e5a24039b7a19556811413b609d1b334684a1b;hb=bbfc8f9a9b84cc019dff0c23d52aac83beb6be64;hp=298e3e8aed93b0e32222cd4e379ad25f82d8ab0c;hpb=4d40f88310da3c23d83ec903fac83af87ca659a5;p=~andy%2Fgtk
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index 298e3e8ae..31e5a2403 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -13,20 +13,17 @@
* 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 .
*/
+#ifndef __GTK_BUILDER_H__
+#define __GTK_BUILDER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GTK_BUILDER_H__
-#define __GTK_BUILDER_H__
-
-#include
-#include
+#include
G_BEGIN_DECLS
@@ -120,6 +117,9 @@ GtkBuilder* gtk_builder_new (void);
guint gtk_builder_add_from_file (GtkBuilder *builder,
const gchar *filename,
GError **error);
+guint gtk_builder_add_from_resource (GtkBuilder *builder,
+ const gchar *resource_path,
+ GError **error);
guint gtk_builder_add_from_string (GtkBuilder *builder,
const gchar *buffer,
gsize length,
@@ -128,6 +128,11 @@ guint gtk_builder_add_objects_from_file (GtkBuilder *builder,
const gchar *filename,
gchar **object_ids,
GError **error);
+GDK_AVAILABLE_IN_3_4
+guint gtk_builder_add_objects_from_resource(GtkBuilder *builder,
+ const gchar *resource_path,
+ gchar **object_ids,
+ GError **error);
guint gtk_builder_add_objects_from_string (GtkBuilder *builder,
const gchar *buffer,
gsize length,
@@ -136,6 +141,10 @@ guint gtk_builder_add_objects_from_string (GtkBuilder *builder,
GObject* gtk_builder_get_object (GtkBuilder *builder,
const gchar *name);
GSList* gtk_builder_get_objects (GtkBuilder *builder);
+GDK_AVAILABLE_IN_3_8
+void gtk_builder_expose_object (GtkBuilder *builder,
+ const gchar *name,
+ GObject *object);
void gtk_builder_connect_signals (GtkBuilder *builder,
gpointer user_data);
void gtk_builder_connect_signals_full (GtkBuilder *builder,