* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#undef GTK_DISABLE_DEPRECATED
+
+#include "config.h"
#include "gtkmain.h"
+#include "gtkmarshalers.h"
#include "gtksignal.h"
#include "gtklist.h"
#define GTK_ENABLE_BROKEN
#include "gtktree.h"
#include "gtktreeitem.h"
+#include "gtkintl.h"
+
+#include "gtkalias.h"
enum {
SELECTION_CHANGED,
(GtkClassInitFunc) NULL,
};
+ I_("GtkTree");
tree_type = gtk_type_unique (gtk_container_get_type (), &tree_info);
}
class->unselect_child = gtk_real_tree_unselect_child;
tree_signals[SELECTION_CHANGED] =
- gtk_signal_new ("selection_changed",
+ gtk_signal_new (I_("selection-changed"),
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTreeClass, selection_changed),
- gtk_marshal_VOID__VOID,
+ _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
tree_signals[SELECT_CHILD] =
- gtk_signal_new ("select_child",
+ gtk_signal_new (I_("select-child"),
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTreeClass, select_child),
- gtk_marshal_VOID__OBJECT,
+ _gtk_marshal_VOID__OBJECT,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
tree_signals[UNSELECT_CHILD] =
- gtk_signal_new ("unselect_child",
+ gtk_signal_new (I_("unselect-child"),
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child),
- gtk_marshal_VOID__OBJECT,
+ _gtk_marshal_VOID__OBJECT,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
}
tree->children = g_list_insert (tree->children, tree_item, position);
gtk_widget_set_parent (tree_item, GTK_WIDGET (tree));
-
- if (GTK_WIDGET_REALIZED (tree_item->parent))
- gtk_widget_realize (tree_item);
-
- if (GTK_WIDGET_VISIBLE (tree_item->parent) && GTK_WIDGET_VISIBLE (tree_item))
- {
- if (GTK_WIDGET_MAPPED (tree_item->parent))
- gtk_widget_map (tree_item);
-
- gtk_widget_queue_resize (tree_item);
- }
}
static void
gtk_widget_set_parent (child, GTK_WIDGET (container));
- if (GTK_WIDGET_REALIZED (child->parent))
- gtk_widget_realize (child);
-
- if (GTK_WIDGET_VISIBLE (child->parent) && GTK_WIDGET_VISIBLE (child))
- {
- if (GTK_WIDGET_MAPPED (child->parent))
- gtk_widget_map (child);
-
- gtk_widget_queue_resize (child);
- }
-
if (!tree->selection && (tree->selection_mode == GTK_SELECTION_BROWSE))
gtk_tree_select_child (tree, child);
}
child = children->data;
children = children->next;
- gtk_widget_ref (child);
+ g_object_ref (child);
gtk_widget_unparent (child);
gtk_widget_destroy (child);
- gtk_widget_unref (child);
+ g_object_unref (child);
}
g_list_free (tree->children);
{
GList *node;
for (node = tree->selection; node; node = node->next)
- gtk_widget_unref ((GtkWidget *)node->data);
+ g_object_unref (node->data);
g_list_free (tree->selection);
tree->selection = NULL;
}
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+ GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void
GTK_TREE (tmp_item->parent)->root_tree == tree)
gtk_tree_item_deselect (GTK_TREE_ITEM (tmp_item));
- gtk_widget_unref (tmp_item);
+ g_object_unref (tmp_item);
tmp_list = tmp_list->next;
}
GtkWidget *child;
GList *children;
- if (widget->parent && GTK_IS_TREE (widget->parent))
+ if (GTK_IS_TREE (widget->parent))
{
gtk_tree_unselect_all (tree);
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child) &&
- !GTK_WIDGET_MAPPED (child))
+ if (gtk_widget_get_visible (child) &&
+ !gtk_widget_get_mapped (child))
gtk_widget_map (child);
if (GTK_TREE_ITEM (child)->subtree)
{
child = GTK_WIDGET (GTK_TREE_ITEM (child)->subtree);
- if (GTK_WIDGET_VISIBLE (child) && !GTK_WIDGET_MAPPED (child))
+ if (gtk_widget_get_visible (child) && !gtk_widget_get_mapped (child))
gtk_widget_map (child);
}
}
g_list_free (item_list);
}
-/* used by gtk_tree_remove_items to make the function independant of
+/* used by gtk_tree_remove_items to make the function independent of
order in list of items to remove.
- Sort item bu depth in tree */
+ Sort item by depth in tree */
static gint
gtk_tree_sort_item_by_depth(GtkWidget* a, GtkWidget* b)
{
else
{
GtkWidget *tmp = GTK_WIDGET (tree);
- while (tmp->parent && GTK_IS_TREE (tmp->parent))
+ while (GTK_IS_TREE (tmp->parent))
tmp = tmp->parent;
root_tree = GTK_TREE (tmp);
g_message("* remove subtree associate at this item [%#x]\n",
(int) GTK_TREE_ITEM(widget)->subtree);
#endif /* TREE_DEBUG */
- if (GTK_WIDGET_MAPPED (GTK_TREE_ITEM(widget)->subtree))
+ if (gtk_widget_get_mapped (GTK_TREE_ITEM(widget)->subtree))
gtk_widget_unmap (GTK_TREE_ITEM(widget)->subtree);
gtk_widget_unparent (GTK_TREE_ITEM(widget)->subtree);
#ifdef TREE_DEBUG
g_message("* unmap and unparent widget [%#x]\n", (int)widget);
#endif /* TREE_DEBUG */
- if (GTK_WIDGET_MAPPED (widget))
+ if (gtk_widget_get_mapped (widget))
gtk_widget_unmap (widget);
gtk_widget_unparent (widget);
root_tree->selection = g_list_remove (root_tree->selection, widget);
/* unref it to authorize is destruction */
- gtk_widget_unref (widget);
+ g_object_unref (widget);
}
/* emit only one selection_changed signal */
gtk_tree_select_child (root_tree, widget);
}
- if (GTK_WIDGET_VISIBLE (root_tree))
+ if (gtk_widget_get_visible (GTK_WIDGET (root_tree)))
{
#ifdef TREE_DEBUG
g_message("* query queue resizing for root_tree\n");
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child))
+ if (gtk_widget_get_visible (child))
{
GtkRequisition child_requisition;
gtk_widget_get_child_requisition (child, &child_requisition);
child_allocation.y += child_allocation.height;
if((subtree = GTK_TREE_ITEM(child)->subtree))
- if(GTK_WIDGET_VISIBLE (subtree))
+ if(gtk_widget_get_visible (subtree))
{
child_allocation.height = subtree->requisition.height;
gtk_widget_size_allocate (subtree, &child_allocation);
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child))
+ if (gtk_widget_get_visible (child))
{
gtk_widget_size_request (child, &child_requisition);
requisition->height += child_requisition.height;
if((subtree = GTK_TREE_ITEM(child)->subtree) &&
- GTK_WIDGET_VISIBLE (subtree))
+ gtk_widget_get_visible (subtree))
{
gtk_widget_size_request (subtree, &child_requisition);
selection = selection->next;
root_selection = g_list_remove_link (root_selection, tmp_list);
- gtk_widget_unref (tmp_item);
+ g_object_unref (tmp_item);
g_list_free (tmp_list);
}
{
gtk_tree_item_select (GTK_TREE_ITEM (child));
root_selection = g_list_prepend (root_selection, child);
- gtk_widget_ref (child);
+ g_object_ref (child);
}
else if (child->state == GTK_STATE_SELECTED)
{
gtk_tree_item_deselect (GTK_TREE_ITEM (child));
root_selection = g_list_remove (root_selection, child);
- gtk_widget_unref (child);
+ g_object_unref (child);
}
tree->root_tree->selection = root_selection;
selection = selection->next;
root_selection = g_list_remove_link (root_selection, tmp_list);
- gtk_widget_unref (tmp_item);
+ g_object_unref (tmp_item);
g_list_free (tmp_list);
}
{
gtk_tree_item_select (GTK_TREE_ITEM (child));
root_selection = g_list_prepend (root_selection, child);
- gtk_widget_ref (child);
+ g_object_ref (child);
tree->root_tree->selection = root_selection;
gtk_signal_emit (GTK_OBJECT (tree->root_tree),
tree_signals[SELECTION_CHANGED]);
break;
case GTK_SELECTION_MULTIPLE:
- if (child->state == GTK_STATE_NORMAL)
- {
- gtk_tree_item_select (GTK_TREE_ITEM (child));
- root_selection = g_list_prepend (root_selection, child);
- gtk_widget_ref (child);
- tree->root_tree->selection = root_selection;
- gtk_signal_emit (GTK_OBJECT (tree->root_tree),
- tree_signals[SELECTION_CHANGED]);
- }
- else if (child->state == GTK_STATE_SELECTED)
- {
- gtk_tree_item_deselect (GTK_TREE_ITEM (child));
- root_selection = g_list_remove (root_selection, child);
- gtk_widget_unref (child);
- tree->root_tree->selection = root_selection;
- gtk_signal_emit (GTK_OBJECT (tree->root_tree),
- tree_signals[SELECTION_CHANGED]);
- }
- break;
-
- case GTK_SELECTION_EXTENDED:
break;
}
}
switch (tree->selection_mode)
{
case GTK_SELECTION_SINGLE:
- case GTK_SELECTION_MULTIPLE:
case GTK_SELECTION_BROWSE:
if (child->state == GTK_STATE_SELECTED)
{
GtkTree* root_tree = GTK_TREE_ROOT_TREE(tree);
gtk_tree_item_deselect (GTK_TREE_ITEM (child));
root_tree->selection = g_list_remove (root_tree->selection, child);
- gtk_widget_unref (child);
+ g_object_unref (child);
gtk_signal_emit (GTK_OBJECT (tree->root_tree),
tree_signals[SELECTION_CHANGED]);
}
break;
- case GTK_SELECTION_EXTENDED:
+ case GTK_SELECTION_MULTIPLE:
break;
}
}
tree->view_line = flag;
}
+
+#define __GTK_TREE_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff