various small cleanups

[wxWidgets.git] / src / gtk / treeentry_gtk.c

diff --git a/src/gtk/treeentry_gtk.c b/src/gtk/treeentry_gtk.c
index 66e5a75f070dff12c7432a0cbab4fe216491a79b..c0f8b87c510de7e4a6f646c4987b33624bf0d066 100644 (file)
--- a/src/gtk/treeentry_gtk.c
+++ b/src/gtk/treeentry_gtk.c
@@ -46,7 +46,7 @@ gtk_tree_entry_get_type ()
 
     if (!tree_entry_type)
     {
-        static const GTypeInfo tree_entry_info =
+        const GTypeInfo tree_entry_info =
         {
             sizeof (GtkTreeEntryClass),
             NULL,           /* base_init */
@@ -57,6 +57,7 @@ gtk_tree_entry_get_type ()
             sizeof (GtkTreeEntry),
             16,             /* n_preallocs */
             (GInstanceInitFunc) gtk_tree_entry_init, /*instance_init*/
+            NULL            /* value_table */
         };
         tree_entry_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeEntry",
                                                   &tree_entry_info,
@@ -137,21 +138,25 @@ static void gtk_tree_entry_init (GTypeInstance* instance, gpointer g_class)
 static void gtk_tree_entry_string_transform_func(const GValue *src_value,
                                                  GValue *dest_value)
 {
+    GtkTreeEntry *entry;
+
     /* Make sure src is a treeentry and dest can hold a string */
     g_assert(GTK_IS_TREE_ENTRY(src_value->data[0].v_pointer));
     g_assert(G_VALUE_HOLDS(dest_value, G_TYPE_STRING));
 
     /* TODO: Use strdup here or just pass it? */
-    GtkTreeEntry* entry = GTK_TREE_ENTRY(src_value->data[0].v_pointer);
+    entry = GTK_TREE_ENTRY(src_value->data[0].v_pointer);
 
     g_value_set_string(dest_value, entry->label);
 }
 
 static void gtk_tree_entry_dispose(GObject* obj)
 {
+    GtkTreeEntry *entry;
+
     g_assert(GTK_IS_TREE_ENTRY(obj));
 
-    GtkTreeEntry* entry = GTK_TREE_ENTRY(obj);
+    entry = GTK_TREE_ENTRY(obj);
 
     /* free label if it exists */
     if(entry->label)