X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fgtk%2Fviewmenu.c;h=e7b068feab967300f37169a19bd7685ce6f5cbf4;hb=f7e3f1d8d0438f52e4f988a12318075cc1b43568;hp=b4ce153c82caf50a27ba9d3b4c84011048b42c82;hpb=5e7b849e7d9263ea7e4b06ea95e989fbff251b97;p=emu8051.git

diff --git a/src/gtk/viewmenu.c b/src/gtk/viewmenu.c
index b4ce153..e7b068f 100644
--- a/src/gtk/viewmenu.c
+++ b/src/gtk/viewmenu.c
@@ -4,19 +4,7 @@
  * Copyright (C) 1999 Jonathan St-André
  * Copyright (C) 1999 Hugo Villeneuve <hugo@hugovil.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This file is released under the GPLv2
  */
 
 #if HAVE_CONFIG_H
@@ -26,7 +14,7 @@
 #include <gtk/gtk.h>
 
 #include "common.h"
-#include "emugtk.h" /* For AddMenuSeparator() function. */
+#include "main.h" /* For AddMenuSeparator() function. */
 #include "messagebox.h"
 #include "viewmenu.h"
 #include "app-config.h"
@@ -37,15 +25,14 @@ void toggle_layout(GtkWidget *widget, gpointer data)
 {
 	int id;
 
-        id = GPOINTER_TO_UINT(data);
+	id = GPOINTER_TO_UINT(data);
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		log_info("  Switching to layout %d", id);
 		cfg->layout = id;
 
-		ShowMessage("Notice",
-			    "You must restart for the changes to take effect",
-			    GTK_JUSTIFY_LEFT, MESSAGE_DIALOG_NORMAL_FONT);
+		message_show_information(
+			"You must restart for the changes to take effect");
 	}
 }
 
@@ -53,7 +40,7 @@ void toggle_bytes_per_row(GtkWidget *widget, gpointer data)
 {
 	int bytes_per_row;
 
-        bytes_per_row = GPOINTER_TO_UINT(data);
+	bytes_per_row = GPOINTER_TO_UINT(data);
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		log_info("  Bytes per row = %d", bytes_per_row);
@@ -110,9 +97,11 @@ view_add_layout_submenu(GtkWidget *parent)
 	layout2 = gtk_radio_menu_item_new_with_label(group, "Layout2");
 
 	if (cfg->layout == UI_LAYOUT1)
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(layout1), TRUE);
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(layout1),
+					       TRUE);
 	else
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(layout2), TRUE);
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(layout2),
+					       TRUE);
 
 	g_signal_connect(G_OBJECT(layout1), "activate",
 			 G_CALLBACK(toggle_layout), (gpointer) UI_LAYOUT1);
@@ -143,9 +132,11 @@ view_add_bytes_per_row_submenu(GtkWidget *parent)
 	item2 = gtk_radio_menu_item_new_with_label(group, "16");
 
 	if (cfg->bytes_per_row == 8)
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item1), TRUE);
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item1),
+					       TRUE);
 	else
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item2), TRUE);
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item2),
+					       TRUE);
 
 	g_signal_connect(G_OBJECT(item1), "activate",
 			 G_CALLBACK(toggle_bytes_per_row), (gpointer) 8);
@@ -159,7 +150,7 @@ view_add_bytes_per_row_submenu(GtkWidget *parent)
 }
 
 void
-ViewAddMenu(GtkWidget *menu_bar)
+view_add_menu(GtkWidget *menu_bar)
 {
 	GtkWidget *item;
 	GtkWidget *menu;
@@ -183,12 +174,12 @@ ViewAddMenu(GtkWidget *menu_bar)
 	g_signal_connect(G_OBJECT(item), "activate",
 			 G_CALLBACK(toggle_ext_memory), NULL);
 
-	AddMenuSeparator(menu);
+	add_menu_separator(menu);
 
 	/* Add layout submenu */
 	view_add_layout_submenu(menu);
 
-	AddMenuSeparator(menu);
+	add_menu_separator(menu);
 
 	/* Add bytes per row submenu */
 	view_add_bytes_per_row_submenu(menu);