[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright/gtkshell menu.c option_options.c
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright/gtkshell menu.c option_options.c |
Date: |
Sun, 09 Sep 2007 18:03:18 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/09/09 18:03:17
Modified files:
gtkshell : menu.c option_options.c
Log message:
Split out submenu opening code from item iteration.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/menu.c?cvsroot=antiright&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.32&r2=1.33
Patches:
Index: menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/menu.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- menu.c 11 Jun 2007 21:32:43 -0000 1.24
+++ menu.c 9 Sep 2007 18:03:17 -0000 1.25
@@ -111,6 +111,24 @@
}
static void
+parse_submenu_or_item_specification(GSH * gsh, gchar ** tokens,
+ guint * submenu_count, GtkWidget ** submenus,
+ const guint max_menus, guint * i)
+{
+ const gchar * submenu_open = "-->";
+ const gboolean start_submenu = (!strncmp(tokens[*i],
+ submenu_open, 3) && *submenu_count < max_menus);
+
+ if(start_submenu)
+ GSH_SET(GSH_MENU_BUTTON);
+ /* Create the menu item. */
+ menuitem_parse(gsh, tokens[*i]);
+ if(start_submenu)
+ begin_submenu(gsh, submenus, submenu_count,
+ i, tokens);
+}
+
+static void
perform_addition_for_each_item(struct GSH * gsh, gchar ** tokens)
{
guint i;
@@ -129,19 +147,8 @@
gsh->rows->v=submenus[--submenu_count];
}
else
- {
- const gchar * submenu_open = "-->";
- const gboolean start_submenu = (!strncmp(tokens[i],
- submenu_open, 3) && submenu_count < max_menus);
-
- if(start_submenu)
- GSH_SET(GSH_MENU_BUTTON);
- /* Create the menu item. */
- menuitem_parse(gsh, tokens[i]);
- if(start_submenu)
- begin_submenu(gsh, submenus, &submenu_count,
- &i, tokens);
- }
+ parse_submenu_or_item_specification(gsh, tokens,
+ &submenu_count, submenus, max_menus, &i);
}
}
Index: option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- option_options.c 11 Jun 2007 21:32:43 -0000 1.32
+++ option_options.c 9 Sep 2007 18:03:17 -0000 1.33
@@ -60,8 +60,11 @@
/* Test for gsh->icon_size equality. */
#define GISCMP(text) !strcmp(text, arg)
+#define IFGISCMP(str, siz) if(GISCMP(str)) GIS=GTKIS(MENU);
+
+
if(GISCMP("menu"))
- gsh->icon_size=GTKIS(MENU);
+ GIS=GTKIS(MENU);
else if(GISCMP("small toolbar"))
GIS=GTKIS(SMALL_TOOLBAR);
else if(GISCMP("large toolbar") || GISCMP("toolbar"))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright/gtkshell menu.c option_options.c,
Jeffrey Bedard <=