X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7c12d28e63a7458293ea54f523c01d848236a3e..0739e2eef923040b51c664a22c7a6765fbd8a6f1:/src/gtk/treegtk.cpp diff --git a/src/gtk/treegtk.cpp b/src/gtk/treegtk.cpp index 736d6dd36b..d5c5ddff1d 100644 --- a/src/gtk/treegtk.cpp +++ b/src/gtk/treegtk.cpp @@ -152,12 +152,14 @@ static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data) { gtk_container_foreach(GTK_CONTAINER(widget), gtk_treectrl_count_callback, data); } -size_t wxTreeCtrl::GetCount() const { - int count = 0; +unsigned int wxTreeCtrl::GetCount() const +{ + int count = 0; + + if (m_anchor != NULL) + gtk_treectrl_count_callback(GTK_WIDGET(m_anchor), &count); - if (m_anchor != NULL) - gtk_treectrl_count_callback(GTK_WIDGET(m_anchor), &count); - return count; + return (unsigned int)count; } unsigned int wxTreeCtrl::GetIndent() const { @@ -714,7 +716,7 @@ long wxTreeCtrl::GetChild(long item) const { GtkTreeItem *next = NULL; p = findGtkTreeItem(item); - GList *list = gtk_container_children(GTK_CONTAINER(p)); + GList *list = gtk_container_get_children(GTK_CONTAINER(p)); next = GTK_TREE_ITEM(list->data); if (next != NULL) @@ -726,7 +728,7 @@ long wxTreeCtrl::GetChild(long item) const { long wxTreeCtrl::GetFirstVisibleItem(void) const { GtkTreeItem *next = NULL; - GList *list = gtk_container_children(GTK_CONTAINER(m_anchor)); + GList *list = gtk_container_get_children(GTK_CONTAINER(m_anchor)); next = GTK_TREE_ITEM(list->data); // gtk_container_foreach(GTK_CONTAINER(m_anchor), gtk_treectrl_next_visible_callback, &next); @@ -741,7 +743,7 @@ long wxTreeCtrl::GetNextVisibleItem(long item) const { GtkTreeItem *next = NULL; p = findGtkTreeItem(item); - GList *list = gtk_container_children(GTK_CONTAINER(p)); + GList *list = gtk_container_get_children(GTK_CONTAINER(p)); next = GTK_TREE_ITEM(list->data); // gtk_container_foreach(GTK_CONTAINER(p), gtk_treectrl_next_visible_callback, &next);