X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fhelpmenu.c;h=3bde4ce1b755c72f7dc2b4d0c8808de34dcef63d;hb=6c53f8ff0267ae104d1b60efb3b8285df338e473;hp=f1a468a8547418ab3cdbeb05cec47d9770d963a6;hpb=6a65dca9d597772744524b909f2d89b479b8bf77;p=emu8051.git

diff --git a/src/helpmenu.c b/src/helpmenu.c
index f1a468a..3bde4ce 100644
--- a/src/helpmenu.c
+++ b/src/helpmenu.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #if HAVE_CONFIG_H
@@ -37,50 +37,44 @@
 #include "messagebox.h"
 #include "helpmenu.h"
 
-
 static void
-HelpCommandsEvent( gchar *string )
+HelpCommandsEvent(gchar *string)
 {
-  ShowMessage( "Command Line Options", COMMAND_LINE_OPTIONS, GTK_JUSTIFY_LEFT,
-	       MESSAGE_DIALOG_FIXED_FONT );
+	ShowMessage("Command Line Options", COMMAND_LINE_OPTIONS,
+		    GTK_JUSTIFY_LEFT, MESSAGE_DIALOG_FIXED_FONT);
 }
 
-
 static void
-HelpAboutEvent( gchar *string )
+HelpAboutEvent(gchar *string)
 {
-  ShowMessage( "About", VERSION_STRING, GTK_JUSTIFY_CENTER, MESSAGE_DIALOG_NORMAL_FONT );
+	ShowMessage("About", VERSION_STRING, GTK_JUSTIFY_CENTER,
+		    MESSAGE_DIALOG_NORMAL_FONT);
 }
 
-
 void
-HelpAddMenu( GtkWidget *menu_bar )
+HelpAddMenu(GtkWidget *menu_bar)
 {
-  GtkWidget *item;
-  GtkWidget *menu;
-  
-  menu = gtk_menu_new();
+	GtkWidget *item;
+	GtkWidget *menu;
+
+	menu = gtk_menu_new();
+
+	/* Create the 'Help Command Line Options' item. */
+	item = gtk_menu_item_new_with_label("Command Line Options");
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	/* Attach the callback functions to the activate signal. */
+	g_signal_connect(item, "activate", G_CALLBACK(HelpCommandsEvent), NULL);
 
-  /* Create the 'Help Command Line Options' item. */
-  item = gtk_menu_item_new_with_label("Command Line Options");
-  gtk_menu_append( GTK_MENU(menu), item );
-  /* Attach the callback functions to the activate signal. */
-  gtk_signal_connect_object( GTK_OBJECT(item), "activate",
-			     GTK_SIGNAL_FUNC(HelpCommandsEvent),
-			     NULL );
+	AddMenuSeparator(menu);
 
-  AddMenuSeparator(menu);
+	/* Create the 'Help About' item. */
+	item = gtk_menu_item_new_with_label("About " PACKAGE);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	/* Attach the callback functions to the activate signal. */
+	g_signal_connect(item, "activate", G_CALLBACK(HelpAboutEvent), NULL);
 
-  /* Create the 'Help About' item. */
-  item = gtk_menu_item_new_with_label( "About " PACKAGE );
-  gtk_menu_append( GTK_MENU(menu), item );
-  /* Attach the callback functions to the activate signal. */
-  gtk_signal_connect_object( GTK_OBJECT(item), "activate",
-			     GTK_SIGNAL_FUNC(HelpAboutEvent),
-			     NULL );
-  
-  /* Adding submenu title. */
-  item = gtk_menu_item_new_with_label( "Help" );
-  gtk_menu_item_set_submenu( GTK_MENU_ITEM(item), menu );
-  gtk_menu_bar_append( GTK_MENU_BAR( menu_bar ), item );
+	/* Adding submenu title. */
+	item = gtk_menu_item_new_with_label("Help");
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
+	gtk_menu_shell_append((GtkMenuShell *) menu_bar, item);
 }