From 469bcb1b5380f72cdd02242ea85c9f2e55532af1 Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Sat, 19 Mar 2011 00:39:27 +0000
Subject: [PATCH] gtk: removed redundant functions and changed "pause
 emulation" to "pause"

---
 src/drivers/sdl/gui.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/drivers/sdl/gui.cpp b/src/drivers/sdl/gui.cpp
index 8c7ebc35..6f60cdcb 100644
--- a/src/drivers/sdl/gui.cpp
+++ b/src/drivers/sdl/gui.cpp
@@ -1114,17 +1114,6 @@ void emuReset ()
 		ResetNES();
 }
 
-void emuPause ()
-{
-	if(isloaded)
-		FCEUI_SetEmulationPaused(1);
-}
-void emuResume ()
-{
-	if(isloaded)
-		FCEUI_SetEmulationPaused(0);
-}
-
 void enableFullscreen ()
 {
 	if(isloaded)
@@ -1395,7 +1384,6 @@ void loadGameGenie ()
 
 }
 
-
 void loadNSF ()
 {
 	GtkWidget* fileChooser;
@@ -1861,8 +1849,6 @@ static char* menuXml =
 	"    <menu action='MovieMenuAction'>"
 	"      <menuitem action='OpenMovieAction' />"
 	"      <menuitem action='StopMovieAction' />"
-	"      <menuitem action='PauseAction' />"
-	"      <menuitem action='ResumeAction' />"
 	"      <separator />"
 	"      <menuitem action='RecordMovieAction' />"
 	"      <menuitem action='RecordMovieAsAction' />"
@@ -1899,7 +1885,6 @@ static GtkActionEntry normal_entries[] = {
 	{"EmulatorMenuAction", NULL, "_Emulator"},
 	{"PowerAction", NULL, "P_ower", NULL, NULL, G_CALLBACK(FCEUI_PowerNES)},
 	{"ResetAction", GTK_STOCK_REFRESH, "_Reset", NULL, NULL, G_CALLBACK(emuReset)},
-	{"PauseAction", GTK_STOCK_MEDIA_PAUSE, "_Pause", NULL, NULL, G_CALLBACK(emuPause)},
 	{"FdsMenuAction", GTK_STOCK_FLOPPY, "_FDS"},
 	{"SwitchDiskAction", "go-jump", "_Switch Disk", NULL, NULL, G_CALLBACK(FCEU_FDSSelect)},
 	{"EjectDiskAction", "media-eject", "_Eject Disk", NULL, NULL, G_CALLBACK(FCEU_FDSInsert)},
@@ -1920,7 +1905,7 @@ static GtkActionEntry normal_entries[] = {
 // Menu items with a check box that can be toggled on or off
 static GtkToggleActionEntry toggle_entries[] = {
 	{"GameGenieToggleAction", NULL, "Enable Game _Genie", NULL, NULL, G_CALLBACK(toggleGameGenie), FALSE},
-	{"PauseToggleAction", NULL, "_Pause Emulation", NULL, NULL, G_CALLBACK(togglePause), FALSE}
+	{"PauseToggleAction", GTK_STOCK_MEDIA_PAUSE, "_Pause", NULL, NULL, G_CALLBACK(togglePause), FALSE}
 };
 
 static GtkWidget* CreateMenubar( GtkWidget* window)