Ticket #33: memory-bug.diff

demos/cairo/cairo_clock/clock.d

@@ -63 +63 @@
-        
-        // This is where we draw on the window
-        
-Drawable
+Window
-        
-        int width;
-        int height;

wrap/APILookupGObject.txt

@@ -172 +172 @@
-        if ( gObject !is  null )
-        {
-            //writefln("ObjectG.this\n");
+
+            //Check if there already is a D object for this gtk struct
+            void* ptr = getDObject(gObject);
+            if( ptr !is null )
+            {
+                this = cast(ObjectG)ptr;
+                return;
+            }
+
-            objectGSetDataFull("GObject",cast(void*)this);
-        }
-    }
@@ -203 +212 @@
-        }
-    }
-
+    /**
+     * Gets a D Object from the objects table of associations.
+     * Params:
+     *  object = GObject containing the associations.
+     * Returns: the D Object if found, or NULL if no such Object exists.
+     */
+    public static void* getDObject(GObject* obj)
+    {
+        //gpointer g_object_get_data(GObject *object, const gchar *key);
+        return g_object_get_data(obj, Str.toStringz("GObject"));
+    }
+
-//debug = objectstore;
-//
-//debug(objectstore)
@@ -380 +401 @@
-    {
-        g_object_set( gObject, Str.toStringz(propertyName), value, null);
-    }
-    
-code: end
-
-outFile: ObjectG

wrap/APILookupGtk.txt

@@ -2328 +2328 @@
-
-struct: GtkTreeModel
-class: TreeModel
+extend: GObject
-prefix: gtk_tree_model_
-noprefix: gtk_tree_row_reference_
-noprefix: gtk_tree_path_

wrap/utils/GtkDClass.d

@@ -614 +614 @@
-                            text ~= " */";
-                            text ~= "public this ("~gtkStruct~"* "~var~")"~iFaceChar;
-                            text ~= "{";
-
-
-
-
+
+
-                                "if("~var~" is null)",
-                                "{",
-                                "   this = null;",
-                                "   version(Exceptions) throw new Exception(\"Null "~var~" passed to constructor.\");",
-                                "   else return;",
-                                "}" ];
+
+                            char[][] checkObject = [
+                                ""
+                                "//Check if there already is a D object for this gtk struct",
+                                "void* ptr = getDObject(cast(GObject*)"~var~");",
+                                "if( ptr !is null )",
+                                "{",
+                                "   this = cast("~convParms.clss~")ptr;",
+                                "   return;",
+                                "}" ];
+
-                            text ~= checkIfNull;
+                            if ( gtkDParentName.length > 0 && gtkDParentName != "Surface" )
+                                text ~= checkObject;
+
-                            if ( parentName.length > 0 )
-                            {
-                                text ~= "super("~castToParent(var)~");";