// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////// */
+#ifdef __VMS
+#include <types.h>
+typedef pid_t GPid;
+#define G_GNUC_INTERNAL
+#endif
+
#include "wx/gtk/treeentry_gtk.h"
/*
/* public */
-GtkTreeEntry*
+GtkTreeEntry*
gtk_tree_entry_new()
{
return GTK_TREE_ENTRY(g_object_new(GTK_TYPE_TREE_ENTRY, NULL));
if (!tree_entry_type)
{
- static const GTypeInfo tree_entry_info =
+ const GTypeInfo tree_entry_info =
{
sizeof (GtkTreeEntryClass),
NULL, /* base_init */
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,
+ tree_entry_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeEntry",
+ &tree_entry_info,
(GTypeFlags)0);
g_value_register_transform_func(tree_entry_type, G_TYPE_STRING,
gtk_tree_entry_string_transform_func);
entry->userdata = userdata;
}
-void gtk_tree_entry_set_destroy_func (GtkTreeEntry* entry,
+void gtk_tree_entry_set_destroy_func (GtkTreeEntry* entry,
GtkTreeEntryDestroy destroy_func,
gpointer destroy_func_data)
{
g_assert(GTK_IS_TREE_ENTRY(entry));
- entry->destroy_func = destroy_func;
- entry->destroy_func_data = destroy_func_data;
+ entry->destroy_func = destroy_func;
+ entry->destroy_func_data = destroy_func_data;
}
/* private */
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, g_strdup(entry->label));
+ 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)