make sure expand is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.

Thu Feb 17 14:58:16 2005  Manish Singh  <yosh@gimp.org>

        * gtk/gtkuimanager.c (start_element_handler): make sure expand
        is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.
This commit is contained in:
Manish Singh 2005-02-17 22:59:47 +00:00 committed by Manish Singh
parent a7e43ebfaf
commit 6a19b7b894
4 changed files with 18 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Thu Feb 17 14:58:16 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkuimanager.c (start_element_handler): make sure expand
is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.
Thu Feb 17 14:52:57 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.

View File

@ -1,3 +1,8 @@
Thu Feb 17 14:58:16 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkuimanager.c (start_element_handler): make sure expand
is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.
Thu Feb 17 14:52:57 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.

View File

@ -1,3 +1,8 @@
Thu Feb 17 14:58:16 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkuimanager.c (start_element_handler): make sure expand
is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.
Thu Feb 17 14:52:57 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.

View File

@ -1103,7 +1103,7 @@ start_element_handler (GMarkupParseContext *context,
const gchar *action;
GQuark action_quark;
gboolean top;
gboolean expand;
gboolean expand = FALSE;
gboolean raise_error = TRUE;
@ -2496,7 +2496,8 @@ update_node (GtkUIManager *self,
if (info->expand)
{
gtk_tool_item_set_expand (GTK_TOOL_ITEM (item), TRUE);
gtk_separator_tool_item_set_draw (item, FALSE);
gtk_separator_tool_item_set_draw
(GTK_SEPARATOR_TOOL_ITEM (item), FALSE);
separator_mode = SEPARATOR_MODE_VISIBLE;
}
else