diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index d14328ae..fcdcc7e3 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -2115,6 +2115,42 @@ EVT_HANDLER(GameBoyConfigure, "Game Boy options...")
update_opts();
}
+EVT_HANDLER(SetSize1x, "1x")
+{
+ gopts.video_scale = 1;
+ panel->AdjustSize(true);
+}
+
+EVT_HANDLER(SetSize2x, "2x")
+{
+ gopts.video_scale = 2;
+ panel->AdjustSize(true);
+}
+
+EVT_HANDLER(SetSize3x, "3x")
+{
+ gopts.video_scale = 3;
+ panel->AdjustSize(true);
+}
+
+EVT_HANDLER(SetSize4x, "4x")
+{
+ gopts.video_scale = 4;
+ panel->AdjustSize(true);
+}
+
+EVT_HANDLER(SetSize5x, "5x")
+{
+ gopts.video_scale = 5;
+ panel->AdjustSize(true);
+}
+
+EVT_HANDLER(SetSize6x, "6x")
+{
+ gopts.video_scale = 6;
+ panel->AdjustSize(true);
+}
+
EVT_HANDLER(GameBoyAdvanceConfigure, "Game Boy Advance options...")
{
wxDialog* dlg = GetXRCDialog("GameBoyAdvanceConfig");
diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index c55694ee..ac7fced6 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -74,6 +74,13 @@ const wxAcceleratorEntry default_accels[] = {
wxAcceleratorEntry(wxMOD_NONE, WXK_PAUSE, XRCID("Pause")),
wxAcceleratorEntry(wxMOD_CMD, wxT('P'), XRCID("Pause")),
wxAcceleratorEntry(wxMOD_CMD, wxT('R'), XRCID("Reset")),
+ // add shortcuts for original size multiplier #415
+ wxAcceleratorEntry(wxMOD_NONE, wxT('1'), XRCID("SetSize1x")),
+ wxAcceleratorEntry(wxMOD_NONE, wxT('2'), XRCID("SetSize2x")),
+ wxAcceleratorEntry(wxMOD_NONE, wxT('3'), XRCID("SetSize3x")),
+ wxAcceleratorEntry(wxMOD_NONE, wxT('4'), XRCID("SetSize4x")),
+ wxAcceleratorEntry(wxMOD_NONE, wxT('5'), XRCID("SetSize5x")),
+ wxAcceleratorEntry(wxMOD_NONE, wxT('6'), XRCID("SetSize6x")),
// save oldest is more commonly used than save other
//wxAcceleratorEntry(wxMOD_CMD, wxT('S'), XRCID("Save")),
wxAcceleratorEntry(wxMOD_CMD, wxT('S'), XRCID("SaveGameOldest")),
diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
index b5bf9cff..c3662316 100644
--- a/src/wx/xrc/MainMenu.xrc
+++ b/src/wx/xrc/MainMenu.xrc
@@ -295,6 +295,27 @@
1
+