[Antiright-devel] antiright configure gtkshell/button.c gtkshell/...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/12/18 02:19:38

Modified files:
        .              : configure 
        gtkshell       : button.c menu.c 

Log message:
        Use determining code for menubar menus in button.c.  Consolidate
        this code in menu.c with testing macro.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/menu.c?cvsroot=antiright&r1=1.27&r2=1.28

Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- configure   10 Dec 2007 15:13:24 -0000      1.111
+++ configure   18 Dec 2007 02:19:37 -0000      1.112
@@ -33,6 +33,13 @@
 # Must be enabled.  
 USE_GTK=YES
 
+
+# Set default CFLAGS, if necessary.
+if [ "$CFLAGS" = "" ]; then
+       CFLAGS="-Os -fomit-frame-pointer -pipe"
+fi
+
+# Handle command line arguments.
 for ARG in $@; do
        if [ "$ARG" = "-d" ]; then
                echo 'Configuring with debug options...'

Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- gtkshell/button.c   10 Dec 2007 15:13:24 -0000      1.56
+++ gtkshell/button.c   18 Dec 2007 02:19:38 -0000      1.57
@@ -182,29 +182,21 @@
 }
 
 static void
-test_create_toolbutton(GSH * gsh, const gchar * command)
+setup_command_button(struct GSH * gsh, const gchar * command)
 {
+       GtkWidget * button;
+
+       setup_label(button=gsh->widgets.button, command);
+       common_button_setup(gsh, button, command);
+       /* Test if a toolbutton should be created.  */
        if(     GSH_FLAG(GSH_APP_MODE) 
                && gsh->widgets.app.toolbar
                && GTK_IS_MENU_ITEM(gsh->widgets.button) 
-               && strcmp(command, "File")
-               && strcmp(command, "Edit") 
-               && strcmp(command, "View")
-               && strcmp(command, "Help") 
-               && strcmp(command, "Tools"))
+               && (gsh_is_menubar_item(command)==GMT_NONE))
        {
                setup_toolbutton_from_command_button(gsh, command);
        }
-}
-
-static void
-setup_command_button(struct GSH * gsh, const gchar * command)
-{
-       GtkWidget * button;
-
-       setup_label(button=gsh->widgets.button, command);
-       common_button_setup(gsh, button, command);
-       test_create_toolbutton(gsh, command);
+       /* Set button widget options.  */
        if(GTK_IS_BUTTON(button))
                gtk_button_set_alignment(GTK_BUTTON(button), 0.0, 0.5);
 }
@@ -216,10 +208,6 @@
        gboolean return_value;
 
        pair=g_strsplit(string, ",", 2);
-#ifdef DEBUG
-       ARPASSERT(pair);
-       ARPASSERT(pair[0]);
-#endif /* DEBUG */
        if((return_value=(pair[1] != NULL)))
                gsh_image_button(gsh, pair[0], pair[1]);
        g_strfreev(pair);
@@ -227,21 +215,17 @@
        return return_value;
 }
 
-static void
-gsh_command_button(GSH * gsh, const gchar * command)
-{
-       create_button(gsh);
-       setup_command_button(gsh, command);
-       gsh_manage(gsh, gsh->widgets.button);
-}
-
 /* This is just a wrapper around gsh_new_button(), to
    follow the convention of returning a created widget.  */
 GtkWidget *
-gsh_add_button(struct GSH * gsh, const gchar * string)
+gsh_add_button(struct GSH * gsh, const gchar * command)
 {
-       if(!test_image_button(gsh, string))
-               gsh_command_button(gsh, string);
+       if(!test_image_button(gsh, command))
+       {
+               create_button(gsh);
+               setup_command_button(gsh, command);
+               $(gsh, manage, gsh->widgets.button);
+       }
 
        return gsh->widgets.button;
 }

Index: gtkshell/menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/menu.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gtkshell/menu.c     15 Nov 2007 03:17:38 -0000      1.27
+++ gtkshell/menu.c     18 Dec 2007 02:19:38 -0000      1.28
@@ -202,18 +202,14 @@
 GSHMenuType
 gsh_is_menubar_item(const gchar * label)
 {
+#define MENTEST(key, value) if(!strncmp(label, key, 3)) return value;
+       MENTEST("File", GMT_FILE);
+       MENTEST("Edit", GMT_EDIT);
+       MENTEST("Tools", GMT_TOOLS);
+       MENTEST("View", GMT_VIEW);
+       MENTEST("Help", GMT_HELP);
 
-       if(!strcmp(label, "File"))
-               return GMT_FILE;
-       else if(!strcmp(label, "Edit"))
-               return GMT_EDIT;
-       else if(!strcmp(label, "Tools"))
-               return GMT_TOOLS;
-       else if(!strcmp(label, "View"))
-               return GMT_VIEW;
-       else if(!strcmp(label, "Help"))
-               return GMT_HELP;
-       else return GMT_NONE;
+       return GMT_NONE;
 }
 
 static void
@@ -257,6 +253,8 @@
        return menu_item;
 }
 
+
+
 void
 gsh_menubutton_parse(struct GSH * gsh, gchar **tokens)
 {