Changeset 382

Timestamp:

01/03/08 14:07:45 (1 year ago)

Author:

Mike Wey

Message:

Interface Builder Classes - part of the update to 2.12 - see ticket #15

Files:

• trunk/src/build/gtkD.d (modified) (1 diff)
• trunk/src/gtk/BuildableIF.d (added)
• trunk/src/gtk/BuildableT.d (added)
• trunk/src/gtk/Builder.d (added)
• trunk/src/gtkc/gtk.d (modified) (2 diffs)
• trunk/src/gtkc/gtktypes.d (modified) (4 diffs)
• trunk/wrap/APILookupGtk.txt (modified) (2 diffs)

trunk/src/build/gtkD.d

@@ -371 +371 @@
-private import gtk.RecentChooserWidget;
-private import gtk.RecentFilter;
+private import gtk.BuildableIF;
+private import gtk.BuildableT;
+private import gtk.Builder;
-private import gtk.FileSelection;
-private import gtk.ItemFactory;

trunk/src/gtkc/gtk.d

@@ -3308 +3308 @@
-    GtkRecentFilterFlags function(GtkRecentFilter* filter)gtk_recent_filter_get_needed;
-    gboolean function(GtkRecentFilter* filter, GtkRecentFilterInfo* filterInfo)gtk_recent_filter_filter;
+    
+    // gtk.BuildableT
+    
+    
+    // gtk.BuildableT
+    
+    void function(GtkBuildable* buildable, gchar* name)gtk_buildable_set_name;
+    gchar* function(GtkBuildable* buildable)gtk_buildable_get_name;
+    void function(GtkBuildable* buildable, GtkBuilder* builder, GObject* child, gchar* type)gtk_buildable_add_child;
+    void function(GtkBuildable* buildable, GtkBuilder* builder, gchar* name, GValue* value)gtk_buildable_set_buildable_property;
+    GObject* function(GtkBuildable* buildable, GtkBuilder* builder, gchar* name)gtk_buildable_construct_child;
+    gboolean function(GtkBuildable* buildable, GtkBuilder* builder, GObject* child, gchar* tagname, GMarkupParser* parser, gpointer* data)gtk_buildable_custom_tag_start;
+    void function(GtkBuildable* buildable, GtkBuilder* builder, GObject* child, gchar* tagname, gpointer* data)gtk_buildable_custom_tag_end;
+    void function(GtkBuildable* buildable, GtkBuilder* builder, GObject* child, gchar* tagname, gpointer data)gtk_buildable_custom_finished;
+    void function(GtkBuildable* buildable, GtkBuilder* builder)gtk_buildable_parser_finished;
+    GObject* function(GtkBuildable* buildable, GtkBuilder* builder, gchar* childname)gtk_buildable_get_internal_child;
+    
+    // gtk.Builder
+    
+    GtkBuilder* function()gtk_builder_new;
+    guint function(GtkBuilder* builder, gchar* filename, GError** error)gtk_builder_add_from_file;
+    guint function(GtkBuilder* builder, gchar* buffer, gsize length, GError** error)gtk_builder_add_from_string;
+    GObject* function(GtkBuilder* builder, gchar* name)gtk_builder_get_object;
+    GSList* function(GtkBuilder* builder)gtk_builder_get_objects;
+    void function(GtkBuilder* builder, gpointer userData)gtk_builder_connect_signals;
+    void function(GtkBuilder* builder, GtkBuilderConnectFunc func, gpointer userData)gtk_builder_connect_signals_full;
+    void function(GtkBuilder* builder, gchar* domain)gtk_builder_set_translation_domain;
+    gchar* function(GtkBuilder* builder)gtk_builder_get_translation_domain;
+    GType function(GtkBuilder* builder, char* typeName)gtk_builder_get_type_from_name;
+    gboolean function(GtkBuilder* builder, GParamSpec* pspec, gchar* string, GValue* value, GError** error)gtk_builder_value_from_string;
+    gboolean function(GtkBuilder* builder, GType type, gchar* string, GValue* value, GError** error)gtk_builder_value_from_string_type;
-    
-    // gtk.FileSelection
@@ -6063 +6094 @@
-    { "gtk_recent_filter_get_needed",  cast(void**)& gtk_recent_filter_get_needed},
-    { "gtk_recent_filter_filter",  cast(void**)& gtk_recent_filter_filter},
+    { "gtk_buildable_set_name",  cast(void**)& gtk_buildable_set_name},
+    { "gtk_buildable_get_name",  cast(void**)& gtk_buildable_get_name},
+    { "gtk_buildable_add_child",  cast(void**)& gtk_buildable_add_child},
+    { "gtk_buildable_set_buildable_property",  cast(void**)& gtk_buildable_set_buildable_property},
+    { "gtk_buildable_construct_child",  cast(void**)& gtk_buildable_construct_child},
+    { "gtk_buildable_custom_tag_start",  cast(void**)& gtk_buildable_custom_tag_start},
+    { "gtk_buildable_custom_tag_end",  cast(void**)& gtk_buildable_custom_tag_end},
+    { "gtk_buildable_custom_finished",  cast(void**)& gtk_buildable_custom_finished},
+    { "gtk_buildable_parser_finished",  cast(void**)& gtk_buildable_parser_finished},
+    { "gtk_buildable_get_internal_child",  cast(void**)& gtk_buildable_get_internal_child},
+    { "gtk_builder_new",  cast(void**)& gtk_builder_new},
+    { "gtk_builder_add_from_file",  cast(void**)& gtk_builder_add_from_file},
+    { "gtk_builder_add_from_string",  cast(void**)& gtk_builder_add_from_string},
+    { "gtk_builder_get_object",  cast(void**)& gtk_builder_get_object},
+    { "gtk_builder_get_objects",  cast(void**)& gtk_builder_get_objects},
+    { "gtk_builder_connect_signals",  cast(void**)& gtk_builder_connect_signals},
+    { "gtk_builder_connect_signals_full",  cast(void**)& gtk_builder_connect_signals_full},
+    { "gtk_builder_set_translation_domain",  cast(void**)& gtk_builder_set_translation_domain},
+    { "gtk_builder_get_translation_domain",  cast(void**)& gtk_builder_get_translation_domain},
+    { "gtk_builder_get_type_from_name",  cast(void**)& gtk_builder_get_type_from_name},
+    { "gtk_builder_value_from_string",  cast(void**)& gtk_builder_value_from_string},
+    { "gtk_builder_value_from_string_type",  cast(void**)& gtk_builder_value_from_string_type},
-    { "gtk_file_selection_new",  cast(void**)& gtk_file_selection_new},
-    { "gtk_file_selection_set_filename",  cast(void**)& gtk_file_selection_set_filename},

trunk/src/gtkc/gtktypes.d

@@ -1917 +1917 @@
-}
-alias GtkRecentFilterFlags RecentFilterFlags;
+
+public enum GtkBuilderError
+{
+    INVALID_TYPE_FUNCTION,
+    UNHANDLED_TAG,
+    MISSING_ATTRIBUTE,
+    INVALID_ATTRIBUTE,
+    INVALID_TAG,
+    MISSING_PROPERTY_VALUE,
+    INVALID_VALUE
+}
+alias GtkBuilderError BuilderError;
-
-
@@ -4635 +4647 @@
-/**
- * Main Gtk struct.
+ */
+public struct GtkBuildable{}
+
+
+/**
+ * The GtkBuildableIface interface contains method that are
+ * necessary to allow GtkBuilder to construct an object from
+ * a GtkBuilder UI definition.
+ * GTypeInterfaceg_iface;
+ * the parent class
+ * set_name()
+ * Stores the name attribute given in the GtkBuilder UI definition.
+ */
+public struct GtkBuildableIface{}
+// GTypeInterface gIface;
+// gtk-gtkbuildable.html
+// /+* virtual table +/
+// gtk-gtkbuildable.html
+// void (* setName) (GtkBuildable *buildable,
+// gtk-gtkbuildable.html
+// char *name);
+// gtk-gtkbuildable.html
+// char * (* getName) (GtkBuildable *buildable);
+// gtk-gtkbuildable.html
+// void (* addChild) (GtkBuildable *buildable,
+// gtk-gtkbuildable.html
+// GtkBuilder *builder,
+// gtk-gtkbuildable.html
+// GObject *child,
+// gtk-gtkbuildable.html
+// char *type);
+// gtk-gtkbuildable.html
+// void (* setBuildableProperty) (GtkBuildable *buildable,
+// gtk-gtkbuildable.html
+// GtkBuilder *builder,
+// gtk-gtkbuildable.html
+// char *name,
+// gtk-gtkbuildable.html
+// GValue *value);
+// gtk-gtkbuildable.html
+// GObject * (* constructChild) (GtkBuildable *buildable,
+// gtk-gtkbuildable.html
+// GtkBuilder *builder,
+// gtk-gtkbuildable.html
+// char *name);
+// gtk-gtkbuildable.html
+// int (* customTagStart) (GtkBuildable *buildable,
+// gtk-gtkbuildable.html
+// GtkBuilder *builder,
+// gtk-gtkbuildable.html
+// GObject *child,
+// gtk-gtkbuildable.html
+// char *tagname,
+// gtk-gtkbuildable.html
+// GMarkupParser *parser,
+// gtk-gtkbuildable.html
+// void* *data);
+// gtk-gtkbuildable.html
+// void (* customTagEnd) (GtkBuildable *buildable,
+// gtk-gtkbuildable.html
+// GtkBuilder *builder,
+// gtk-gtkbuildable.html
+// GObject *child,
+// gtk-gtkbuildable.html
+// char *tagname,
+// gtk-gtkbuildable.html
+// void* *data);
+// gtk-gtkbuildable.html
+// void (* customFinished) (GtkBuildable *buildable,
+// gtk-gtkbuildable.html
+// GtkBuilder *builder,
+// gtk-gtkbuildable.html
+// GObject *child,
+// gtk-gtkbuildable.html
+// char *tagname,
+// gtk-gtkbuildable.html
+// void* data);
+// gtk-gtkbuildable.html
+// void (* parserFinished) (GtkBuildable *buildable,
+// gtk-gtkbuildable.html
+// GtkBuilder *builder);
+// gtk-gtkbuildable.html
+// GObject * (* getInternalChild) (GtkBuildable *buildable,
+// gtk-gtkbuildable.html
+// GtkBuilder *builder,
+// gtk-gtkbuildable.html
+// char *childname);
+// gtk-gtkbuildable.html
+
+
+/**
+ * Main Gtk struct.
+ */
+public struct GtkBuilder{}
+
+
+/**
+ * Main Gtk struct.
- * Warning
- * GtkFileSelection is deprecated and should not be used in newly-written code.
@@ -6045 +6155 @@
-
-/*
+ * object:
+ * type:
+ */
+// TODO
+// #define GTK_BUILDER_WARN_INVALID_CHILD_TYPE(object, type)
+
+/*
- * Each GTK+ module must have a function gtk_module_init() with this prototype.
- * This function is called after loading the module with the argc and argv
@@ -6835 +6952 @@
-// gboolean (*GtkRecentFilterFunc) (const GtkRecentFilterInfo *filter_info,  gpointer user_data);
-public typedef extern(C) int  function (GtkRecentFilterInfo*, void*) GtkRecentFilterFunc;
+
+/*
+ * This is the signature of a function used to connect signals. It is used
+ * by the gtk_builder_connect_signals() and gtk_builder_connect_signals_full()
+ * methods. It is mainly intended for interpreted language bindings, but
+ * could be useful where the programmer wants more control over the signal
+ * connection process.
+ * builder:
+ *  a GtkBuilder
+ * object:
+ *  object to connect a signal to
+ * signal_name:
+ *  name of the signal
+ * handler_name:
+ *  name of the handler
+ * connect_object:
+ *  a GObject, if non-NULL, use g_signal_connect_object()
+ * flags:
+ *  GConnectFlags to use
+ * user_data:
+ *  user data
+ * Since 2.12
+ */
+// void (*GtkBuilderConnectFunc) (GtkBuilder *builder,  GObject *object,  const gchar *signal_name,  const gchar *handler_name,  GObject *connect_object,  GConnectFlags flags,  gpointer user_data);
+public typedef extern(C) void  function (GtkBuilder*, GObject*, char[], char[], GObject*, GConnectFlags, void*) GtkBuilderConnectFunc;
-
-/*

trunk/wrap/APILookupGtk.txt

@@ -6188 +6188 @@
-            selectionChangedData = new UserData;
-        }
-
-        selectionChangedData.recentChooser = this;
-        selectionChangedData.listeners = onSelectionChangedListeners;
@@ -6303 +6302 @@
-
-###########################################################
+### Interface builder #####################################
+###########################################################
+
+file: gtk-gtkbuildable.html
+struct: GtkBuildable
+class: BuildableT
+template: TStruct
+prefix: gtk_buildable_
+prefix: gtk_
+import: glib.Str
+import: gobject.ObjectG
+structWrap: GObject* ObjectG
+import: gobject.Value
+structWrap: GValue* Value
+import: gtk.Builder
+structWrap: GtkBuilder* Builder
+#import: glib.MarkupParser
+#structWrap: GMarkupParser* MarkupParser
+interface: BuildableIF
+outFile: BuildableT
+
+file: GtkBuilder.html
+struct: GtkBuilder
+class: Builder
+prefix: gtk_builder_
+prefix: gtk_
+import: glib.Str
+import: gobject.ObjectG
+structWrap: GObject* ObjectG
+import: gobject.ParamSpec
+structWrap: GParamSpec* ParamSpec
+import: gobject.Value
+structWrap: GValue* Value
+import: glib.ListSG
+structWrap: GSList* ListSG
+#import: glib.ErrorG
+#structWrap: GError** ErrorG*
+outFile: Builder
+
+###########################################################
-### Deprecated ############################################
-###########################################################