From cc7dd9b04f44a9777fbb87f0c03b8685c97b5178 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Mon, 20 Jan 2014 22:23:30 -0500 Subject: [PATCH] Remove deprecated view->sfr-window option --- src/gtk/app-config.c | 5 ----- src/gtk/app-config.h | 1 - src/gtk/viewmenu.c | 21 --------------------- 3 files changed, 27 deletions(-) diff --git a/src/gtk/app-config.c b/src/gtk/app-config.c index bbbd6f4..a073e44 100644 --- a/src/gtk/app-config.c +++ b/src/gtk/app-config.c @@ -60,7 +60,6 @@ app_config_init(void) /* View menu options */ cfg->layout = UI_LAYOUT1; cfg->view_int_memory = 1; - cfg->view_sfr_memory = 1; cfg->view_ext_memory = 1; cfg->bytes_per_row = 16; /* 8 or 16 */ } @@ -104,8 +103,6 @@ app_config_load_from_key_file(GKeyFile *kf) } app_config_key_file_get_int(kf, "view", "int_memory", &cfg->view_int_memory); - app_config_key_file_get_int(kf, "view", "sfr_memory", - &cfg->view_sfr_memory); app_config_key_file_get_int(kf, "view", "ext_memory", &cfg->view_ext_memory); app_config_key_file_get_int(kf, "view", "bytes_per_row", @@ -197,8 +194,6 @@ app_config_save(void) g_string_append_printf(buf, "layout=%d\n", cfg->layout); g_string_append_printf(buf, "int_memory=%d\n", cfg->view_int_memory); - g_string_append_printf(buf, "sfr_memory=%d\n", - cfg->view_sfr_memory); g_string_append_printf(buf, "ext_memory=%d\n", cfg->view_ext_memory); g_string_append_printf(buf, "bytes_per_row=%d\n", diff --git a/src/gtk/app-config.h b/src/gtk/app-config.h index b7fc617..d3b4b2b 100644 --- a/src/gtk/app-config.h +++ b/src/gtk/app-config.h @@ -50,7 +50,6 @@ struct app_config_t /* View menu options */ int layout; /* UI Layout 1 or 2 */ int view_int_memory; - int view_sfr_memory; int view_ext_memory; int bytes_per_row; /* 8 or 16 */ }; diff --git a/src/gtk/viewmenu.c b/src/gtk/viewmenu.c index 8f38438..0c5ca74 100644 --- a/src/gtk/viewmenu.c +++ b/src/gtk/viewmenu.c @@ -73,20 +73,6 @@ void toggle_int_memory(GtkWidget *widget, gpointer data) emugtk_restart_gui(); } -void toggle_sfr_memory(GtkWidget *widget, gpointer data) -{ - (void) data; /* Remove compiler warning about unused variables. */ - - if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) { - log_info(" View SFR memory"); - cfg->view_sfr_memory = 1; - } else { - cfg->view_sfr_memory = 0; - } - - emugtk_restart_gui(); -} - void toggle_ext_memory(GtkWidget *widget, gpointer data) { (void) data; /* Remove compiler warning about unused variables. */ @@ -185,13 +171,6 @@ ViewAddMenu(GtkWidget *menu_bar) g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(toggle_int_memory), NULL); - item = gtk_check_menu_item_new_with_label("SFR Memory"); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), - cfg->view_sfr_memory); - g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(toggle_sfr_memory), NULL); - item = gtk_check_menu_item_new_with_label("External Memory"); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), -- 2.20.1