nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved create_menu_item out of g_return_val_if_fail()

Browse Source
This commit is contained in:
Yevgen Muntyan 2005-08-02 21:50:53 +00:00
parent 3e6c7acf9b
commit 6335a5b863
1 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
moo/mooui/moouixml.c
View File

@ -416,11 +416,15 @@ static GtkWidget *create_menu_bar (MooMarkupElement *node,
for (child = node->children; child != NULL; child = child->next) for (child = node->children; child != NULL; child = child->next)
{ {
if (MOO_MARKUP_IS_ELEMENT (child)) if (MOO_MARKUP_IS_ELEMENT (child))
g_return_val_if_fail (create_menu_item (MOO_MARKUP_ELEMENT (child), {
actions, if (!create_menu_item (MOO_MARKUP_ELEMENT (child),
accel_group, tooltips, actions,
GTK_MENU_SHELL (menubar), -1), accel_group, tooltips,
GTK_WIDGET (menubar)); GTK_MENU_SHELL (menubar), -1))
{
g_return_val_if_reached (GTK_WIDGET (menubar));
}
}
} }
return GTK_WIDGET (menubar); return GTK_WIDGET (menubar);
} }
@ -444,40 +448,43 @@ static GtkWidget *create_menu (MooMarkupElement *node,
gtk_menu_set_accel_group (GTK_MENU (menu), accel_group); gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
for (ch = node->children; ch != NULL; ch = ch->next) for (ch = node->children; ch != NULL; ch = ch->next)
{ if (MOO_MARKUP_IS_ELEMENT (ch))
MooMarkupElement *child;
if (!MOO_MARKUP_IS_ELEMENT (ch)) continue;
child = MOO_MARKUP_ELEMENT (ch);
if (!g_ascii_strcasecmp (child->name, "menu") ||
!g_ascii_strcasecmp (child->name, "item"))
{ {
if (need_separator) { MooMarkupElement *child = MOO_MARKUP_ELEMENT (ch);
GtkWidget *sep = gtk_separator_menu_item_new ();
gtk_widget_show (sep); if (!g_ascii_strcasecmp (child->name, "menu") ||
gtk_menu_shell_append (GTK_MENU_SHELL (menu), sep); !g_ascii_strcasecmp (child->name, "item"))
need_separator = FALSE; {
if (need_separator)
{
GtkWidget *sep = gtk_separator_menu_item_new ();
gtk_widget_show (sep);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), sep);
need_separator = FALSE;
}
if (!create_menu_item (child, actions,
accel_group, tooltips,
GTK_MENU_SHELL (menu), -1))
{
g_return_val_if_reached (GTK_WIDGET (menu));
}
start = FALSE;
}
else if (!g_ascii_strcasecmp (child->name, "placeholder"))
{
}
else if (!g_ascii_strcasecmp (child->name, "separator"))
{
if (!start) need_separator = TRUE;
}
else
{
g_critical ("unknown node %s\n", child->name);
return GTK_WIDGET (menu);
} }
g_return_val_if_fail (create_menu_item (child, actions,
accel_group, tooltips,
GTK_MENU_SHELL (menu), -1),
GTK_WIDGET (menu));
start = FALSE;
} }
else if (!g_ascii_strcasecmp (child->name, "placeholder"))
{
}
else if (!g_ascii_strcasecmp (child->name, "separator"))
{
if (!start) need_separator = TRUE;
}
else
{
g_critical ("unknown node %s\n", child->name);
return GTK_WIDGET (menu);
}
}
return GTK_WIDGET (menu); return GTK_WIDGET (menu);
} }