child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child))
+ if (gtk_widget_get_visible (child))
{
GtkRequisition child_requisition;
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);
else if (list_has_grab (list))
gtk_list_end_drag_selection (list);
- if (!GTK_WIDGET_HAS_FOCUS(item))
+ if (!gtk_widget_has_focus(item))
gtk_widget_grab_focus (item);
if (list->add_mode)
container = GTK_CONTAINER (widget);
if (container->focus_child == NULL ||
- !GTK_WIDGET_HAS_FOCUS (container->focus_child))
+ !gtk_widget_has_focus (container->focus_child))
{
if (GTK_LIST (container)->last_focus_child)
gtk_container_set_focus_child
gtk_widget_set_parent (widget, GTK_WIDGET (list));
gtk_signal_connect (GTK_OBJECT (widget), "drag-begin",
- GTK_SIGNAL_FUNC (gtk_list_signal_drag_begin),
+ G_CALLBACK (gtk_list_signal_drag_begin),
list);
gtk_signal_connect (GTK_OBJECT (widget), "toggle-focus-row",
- GTK_SIGNAL_FUNC (gtk_list_signal_toggle_focus_row),
+ G_CALLBACK (gtk_list_signal_toggle_focus_row),
list);
gtk_signal_connect (GTK_OBJECT (widget), "select-all",
- GTK_SIGNAL_FUNC (gtk_list_signal_select_all),
+ G_CALLBACK (gtk_list_signal_select_all),
list);
gtk_signal_connect (GTK_OBJECT (widget), "unselect-all",
- GTK_SIGNAL_FUNC (gtk_list_signal_unselect_all),
+ G_CALLBACK (gtk_list_signal_unselect_all),
list);
gtk_signal_connect (GTK_OBJECT (widget), "undo-selection",
- GTK_SIGNAL_FUNC (gtk_list_signal_undo_selection),
+ G_CALLBACK (gtk_list_signal_undo_selection),
list);
gtk_signal_connect (GTK_OBJECT (widget), "start-selection",
- GTK_SIGNAL_FUNC (gtk_list_signal_start_selection),
+ G_CALLBACK (gtk_list_signal_start_selection),
list);
gtk_signal_connect (GTK_OBJECT (widget), "end-selection",
- GTK_SIGNAL_FUNC (gtk_list_signal_end_selection),
+ G_CALLBACK (gtk_list_signal_end_selection),
list);
gtk_signal_connect (GTK_OBJECT (widget), "extend-selection",
- GTK_SIGNAL_FUNC (gtk_list_signal_extend_selection),
+ G_CALLBACK (gtk_list_signal_extend_selection),
list);
gtk_signal_connect (GTK_OBJECT (widget), "scroll-horizontal",
- GTK_SIGNAL_FUNC (gtk_list_signal_scroll_horizontal),
+ G_CALLBACK (gtk_list_signal_scroll_horizontal),
list);
gtk_signal_connect (GTK_OBJECT (widget), "scroll-vertical",
- GTK_SIGNAL_FUNC (gtk_list_signal_scroll_vertical),
+ G_CALLBACK (gtk_list_signal_scroll_vertical),
list);
gtk_signal_connect (GTK_OBJECT (widget), "toggle-add-mode",
- GTK_SIGNAL_FUNC (gtk_list_signal_toggle_add_mode),
+ G_CALLBACK (gtk_list_signal_toggle_add_mode),
list);
gtk_signal_connect (GTK_OBJECT (widget), "select",
- GTK_SIGNAL_FUNC (gtk_list_signal_item_select),
+ G_CALLBACK (gtk_list_signal_item_select),
list);
gtk_signal_connect (GTK_OBJECT (widget), "deselect",
- GTK_SIGNAL_FUNC (gtk_list_signal_item_deselect),
+ G_CALLBACK (gtk_list_signal_item_deselect),
list);
gtk_signal_connect (GTK_OBJECT (widget), "toggle",
- GTK_SIGNAL_FUNC (gtk_list_signal_item_toggle),
+ G_CALLBACK (gtk_list_signal_item_toggle),
list);
}
else if (list->children)
new_focus_child = list->children->data;
- if (GTK_WIDGET_HAS_FOCUS (container->focus_child))
+ if (gtk_widget_has_focus (container->focus_child))
grab_focus = TRUE;
}
}
}
}
- if (GTK_WIDGET_VISIBLE (list))
+ if (gtk_widget_get_visible (GTK_WIDGET (list)))
gtk_widget_queue_resize (GTK_WIDGET (list));
}
if (container->focus_child)
{
old_focus_child = new_focus_child = container->focus_child;
- if (GTK_WIDGET_HAS_FOCUS (container->focus_child))
+ if (gtk_widget_has_focus (container->focus_child))
grab_focus = TRUE;
}
else
}
}
- if (GTK_WIDGET_VISIBLE (list))
+ if (gtk_widget_get_visible (GTK_WIDGET (list)))
gtk_widget_queue_resize (GTK_WIDGET (list));
}
container = GTK_CONTAINER (list);
if (container->focus_child &&
- GTK_WIDGET_HAS_FOCUS (container->focus_child))
+ gtk_widget_has_focus (container->focus_child))
gtk_widget_grab_focus (list->undo_focus_child);
else
gtk_container_set_focus_child (container, list->undo_focus_child);