Changeset 546

Timestamp:

07/29/08 15:44:50 (4 months ago)

Author:

Mike Wey

Message:

make TreeModel? extendable

Files:

• trunk/src/gtk/TreeModel.d (modified) (6 diffs)
• trunk/src/gtkc/gobjecttypes.d (modified) (1 diff)
• trunk/src/gtkc/gtk.d (modified) (1 diff)
• trunk/wrap/APILookupGtk.txt (modified) (3 diffs)
• trunk/wrap/utils/GtkDClass.d (modified) (1 diff)

trunk/src/gtk/TreeModel.d

@@ -29 +29 @@
- * realStrct=
- * ctorStrct=
-TreeModel
+
- * interf  = 
- * class Code: Yes
- * interface Code: No
- * template for:
-ObjectG
+
- * implements:
- *  - TreeModelIF
- * prefixes:
- * omit structs:
@@ -43 +42 @@
- * omit signals:
- * imports:
+ *  - glib.Str
+ *  - gobject.Type
- *  - gobject.ObjectG
-
+
+
- *  - gtk.TreeIter
- *  - gtk.TreePath
- *  - gobject.Value
- *  - gtk.TreeModelT
- *  - gtk.TreeModelIF
-
+
+
+
- * structWrap:
- * module aliases:
@@ -65 +68 @@
-
-
+private import glib.Str;
+private import gobject.Type;
-private import gobject.ObjectG;
-
+
+
-private import gtk.TreeIter;
-private import gtk.TreePath;
-private import gobject.Value;
-private import gtk.TreeModelT;
-private import gtk.TreeModelIF;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/**
@@ -81 +105 @@
-public class TreeModel : ObjectG, TreeModelIF
-{
+    static GObjectClass* parentClass = null;
+    
+    static this()
+    {
+        Linker linker;
+        
+        linker = new Linker(libPath ~ importLibs[LIBRARY.GTK] );
+        linker.link(links);
+    }
-    
-    // Minimal implementation.
@@ -89 +122 @@
-    {
-        return cast(void*)gtkTreeModel;
+    }
+    
+    public this ()
+    {
+        auto p =  super(customTreeModelgetType(), null);
+        gtkTreeModel = cast(GtkTreeModel*) p.getObjectGStruct();
+        
+        objectGSetDataFull("customTreeModel", cast(void*)this);
-    }
-    
@@ -102 +143 @@
-        }
-        
+        //Check if there already is a D object for this gtk struct
+        void* ptr = g_object_get_data(cast(GObject*) gtkTreeModel, Str.toStringz("customTreeModel"));
+        if( ptr !is null )
+        {
+            this = cast(TreeModel)ptr;
+            return;
+        }
+        
-        super(cast(GObject*)gtkTreeModel);
-        this.gtkTreeModel = gtkTreeModel;
-    }
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
+
+/**
+ */
+

trunk/src/gtkc/gobjecttypes.d

@@ -233 +233 @@
- * An opaque structure used as the base of all interface types.
- */
-
+
+
+
+
+
-
-

trunk/src/gtkc/gtk.d

@@ -1417 +1417 @@
-    
-    
-TreeModel
+
-    
-    

trunk/wrap/APILookupGtk.txt

@@ -2834 +2834 @@
-
-
+
-file:
-
-
-
+
+
-import: gobject.ObjectG
-
-
-
+
+
-import: gtk.TreeIter
-import: gtk.TreePath
-import: gobject.Value
-import: gtk.TreeModelT
-import: gtk.TreeModelIF
-
+
+
+
-
-code: start
+struct CustomTreeModelClass
+{
+    // Padding, not perssent in the GtkD structs.
+    GType g_type; 
+    GSList* construct_properties;
+
+    GObjectClass parentClass;
+
+    // padding
+    gpointer dummy[7];
+}
+
+//We need this function for the interface implementation.
+extern(C) GType function()gtk_tree_model_get_type;
+
+private Symbol[] links = [{ "gtk_tree_model_get_type",  cast(void**)&gtk_tree_model_get_type}];
+
+/**
+ */
+public class TreeModel : ObjectG, TreeModelIF
+{
+    static GObjectClass* parentClass = null;
+
+    static this()
+    {
+        Linker linker;
+
+        linker = new Linker(libPath ~ importLibs[LIBRARY.GTK] );
+        linker.link(links);
+    }
+
-    // Minimal implementation.
-    mixin TreeModelT!(GtkTreeModel);
-
+
-    /** the main Gtk struct as a void* */
-    protected override void* getStruct()
@@ -2858 +2889 @@
-        return cast(void*)gtkTreeModel;
-    }
+
+    public this ()
+    {
+        auto p =  super(customTreeModelgetType(), null);
+        gtkTreeModel = cast(GtkTreeModel*) p.getObjectGStruct();
+
+        objectGSetDataFull("customTreeModel", cast(void*)this);
+    }
-    
-    /**
@@ -2870 +2909 @@
-        }
-
+        //Check if there already is a D object for this gtk struct
+        void* ptr = g_object_get_data(cast(GObject*) gtkTreeModel, Str.toStringz("customTreeModel"));
+        if( ptr !is null )
+        {
+            this = cast(TreeModel)ptr;
+            return;
+        }
+        
-        super(cast(GObject*)gtkTreeModel);
-        this.gtkTreeModel = gtkTreeModel;
-    }
+
+
+    extern(C)
+    {
+        /*
+         *  here we register our new type and its interfaces
+         *  with the type system. If you want to implement
+         *  additional interfaces like GtkTreeSortable, you
+         *  will need to do it here.
+         */
+
+        static GType customTreeModelgetType()
+        {
+            GType customTreeModelType = GType.INVALID;
+
+            /* Some boilerplate type registration stuff */
+            if (customTreeModelType == GType.INVALID)
+            {
+                GTypeInfo customTreeModelInfo =
+                {
+                    CustomTreeModelClass.sizeof,                   /* class size */
+                    null,                                          /* base_init */
+                    null,                                          /* base_finalize */
+                    cast(GClassInitFunc) &customTreeModelClassInit,/* class init function */
+                    null,                                          /* class finalize */
+                    null,                                          /* class_data */
+                    CustomTreeModelClass.sizeof + 1,               /* instance size */
+                    0,                                             /* n_preallocs */
+                    cast(GInstanceInitFunc) &customTreeModelInit   /* instance init */
+                };
+                GInterfaceInfo treeModelInfo =
+                {
+                    cast(GInterfaceInitFunc) &customTreeModelInit,
+                    null,
+                    null
+                };
+
+                /* First register the new derived type with the GObject type system */
+                customTreeModelType = Type.registerStatic (GType.OBJECT, "CustomTreeModel",
+                                                   &customTreeModelInfo, cast(GTypeFlags)0);
+
+                /* Now register our GtkTreeModel interface with the type system */
+                Type.addInterfaceStatic (customTreeModelType, gtk_tree_model_get_type() /*GTK_TYPE_TREE_MODEL*/, &treeModelInfo);
+            }
+
+            return customTreeModelType;
+        }
+
+        /*
+         *  boilerplate GObject/GType stuff.
+         *  Init callback for the type system,
+         *  called once when our new class is created.
+         */
+
+        static void customTreeModelClassInit (void* klass)
+        {
+            GObjectClass* objectClass;
+
+            parentClass = cast(GObjectClass*) Type.classPeekParent(klass);
+            objectClass = cast(GObjectClass*) klass;
+
+            objectClass.finalize = &customTreeModelFinalize;
+        }
+
+        /*
+         *  init callback for the interface registration
+         *  in customTreeModelGetType. Here we override
+         *  the GtkTreeModel interface functions that
+         *  we implement.
+         */
+
+        static void customTreeModelInit (GtkTreeModelIface *iface)
+        {
+            iface.getFlags      = &customTreeModelGetFlags;
+            iface.getNColumns   = &customTreeModelGetNColumns;
+            iface.getColumnType = &customTreeModelGetColumnType;
+            iface.getIter       = &customTreeModelGetIter;
+            iface.getPath       = &customTreeModelGetPath;
+            iface.getValue      = &customTreeModelGetValue;
+            iface.iterNext      = &customTreeModelIterNext;
+            iface.iterChildren  = &customTreeModelIterChildren;
+            iface.iterHasChild  = &customTreeModelIterHasChild;
+            iface.iterNChildren = &customTreeModelIterNChildren;
+            iface.iterNthChild  = &customTreeModelIterNthChild;
+            iface.iterParent    = &customTreeModelIterParent;
+        }
+
+        /*
+         *  this is called just before a custom list is
+         *  destroyed. Free dynamically allocated memory here.
+         */
+
+        static void customTreeModelFinalize (GObject *object)
+        {
+            /* must chain up - finalize parent */
+            parentClass.finalize(object);
+        }
+
+        static GtkTreeModelFlags customTreeModelGetFlags(GtkTreeModel *tree_model)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.getFlags();
+        }
+
+        static int customTreeModelGetNColumns(GtkTreeModel *tree_model)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.getNColumns();
+        }
+
+        static GType customTreeModelGetColumnType(GtkTreeModel *tree_model, int index)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.getColumnType(index);
+        }
+
+        static gboolean customTreeModelGetIter(GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.getIter(new TreeIter(iter), new TreePath(path));
+        }
+
+        static GtkTreePath* customTreeModelGetPath(GtkTreeModel *tree_model, GtkTreeIter *iter)
+        {
+            auto tm = new TreeModel(tree_model);
+            TreePath path = tm.getPath(new TreeIter(iter));
+            
+            return (path is null) ? null : path.getTreePathStruct();
+        }
+
+        static void customTreeModelGetValue(GtkTreeModel *tree_model, GtkTreeIter *iter, int column, GValue *value)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            tm.getValue(new TreeIter(iter), column, new Value(value));
+        }
+
+        static gboolean customTreeModelIterNext(GtkTreeModel *tree_model, GtkTreeIter *iter)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.iterNext(new TreeIter(iter));
+        }
+
+        static gboolean customTreeModelIterChildren(GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.iterChildren(new TreeIter(iter), new TreeIter(parent));
+        }
+
+        static gboolean customTreeModelIterHasChild(GtkTreeModel *tree_model, GtkTreeIter *iter)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.iterHasChild(new TreeIter(iter));
+        }
+
+        static int customTreeModelIterNChildren(GtkTreeModel *tree_model, GtkTreeIter *iter)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.iterNChildren(new TreeIter(iter));
+        }
+
+        static gboolean customTreeModelIterNthChild(GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent, int n)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.iterNthChild(new TreeIter(iter), new TreeIter(parent), n);
+        }
+
+        static gboolean customTreeModelIterParent(GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *child)
+        {
+            auto tm = new TreeModel(tree_model);
+
+            return tm.iterParent(new TreeIter(iter), new TreeIter(child));
+        }
+    }
+}
-code: end
-outFile: TreeModel
+
-
-

trunk/wrap/utils/GtkDClass.d

@@ -1737 +1737 @@
-                getStructInternals(structDef, convParms);
-                collectedStructs ~= "\n}";
+            }
+            else if ( structName == "GTypeInterface")
+            {
+                //Special case to get custom treemodels working.
+                collectedStructs ~= "public struct GTypeInterface";
+                collectedStructs ~= "{";
+                collectedStructs ~= "\tGType gType;         /* iface type */";
+                collectedStructs ~= "\tGType gInstanceType;";
+                collectedStructs ~= "}";
-            }
-            else