ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gtk: removed redundant functions and changed "pause emulation" to "pause"

This commit is contained in:
punkrockguy318 2011-03-19 00:39:27 +00:00
parent 8a19bdc66c
commit 469bcb1b53
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/drivers/sdl/gui.cpp
View File

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