From ed3be72c5a41d3610afda223ff27681e3502742f Mon Sep 17 00:00:00 2001
From: skidau <skidau@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Wed, 6 May 2015 10:38:10 +0000
Subject: [PATCH] Moved the Load State and Save State menus to the File menu.
 Removed the "Welcome to wxVBAM!" status message.

---
 src/wx/guiinit.cpp      |   2 +-
 src/wx/xrc/MainMenu.xrc | 214 ++++++++++++++++++++--------------------
 2 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index 663d8e36..f40a3e5b 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -2195,7 +2195,7 @@ bool MainFrame::BindControls()
 	SetIcon(icon);
 
 	// NOOP if no status area
-	SetStatusText(_("Welcome to wxVBAM!"));
+	SetStatusText(_(""));
 
 	// Prepare system accel table
 	for (int i = 0; i < num_def_accels; i++)
diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
index c14ed722..047e0f53 100644
--- a/src/wx/xrc/MainMenu.xrc
+++ b/src/wx/xrc/MainMenu.xrc
@@ -28,113 +28,6 @@
         </object>
       </object>
       <object class="separator"/>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="ImportBatteryFile">
-          <label>_Battery file...</label>
-        </object>
-        <object class="wxMenuItem" name="ImportGamesharkCodeFile">
-          <label>Gameshark _code file...</label>
-        </object>
-        <object class="wxMenuItem" name="ImportGamesharkActionReplaySnapshot">
-          <label>_Gameshark snapshot...</label>
-        </object>
-        <label>_Import</label>
-      </object>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="ExportBatteryFile">
-          <label>_Battery file...</label>
-        </object>
-        <object class="wxMenuItem" name="ExportGamesharkSnapshot">
-          <label>_Gameshark snapshot...</label>
-        </object>
-        <label>_Export</label>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="ScreenCapture">
-        <label>Screen capt_ure...</label>
-      </object>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="RecordSoundStartRecording">
-          <label>Start _sound recording...</label>
-        </object>
-        <object class="wxMenuItem" name="RecordSoundStopRecording">
-          <label>Stop s_ound recording</label>
-        </object>
-        <object class="wxMenuItem" name="RecordAVIStartRecording">
-          <label>Start _video recording...</label>
-        </object>
-        <object class="wxMenuItem" name="RecordAVIStopRecording">
-          <label>Stop v_ideo recording</label>
-        </object>
-        <object class="wxMenuItem" name="RecordMovieStartRecording">
-          <label>Start _game recording...</label>
-        </object>
-        <object class="wxMenuItem" name="RecordMovieStopRecording">
-          <label>Stop g_ame recording</label>
-        </object>
-        <label>_Record</label>
-      </object>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="PlayMovieStartPlaying">
-          <label>Start playing _movie...</label>
-        </object>
-        <object class="wxMenuItem" name="PlayMovieStopPlaying">
-          <label>Stop playing m_ovie</label>
-        </object>
-        <label>_Play</label>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="wxID_CLOSE"/>
-      <object class="wxMenuItem" name="wxID_EXIT"/>
-    </object>
-    <object class="wxMenu">
-      <label>_Emulation</label>
-      <object class="wxMenuItem" name="Pause">
-        <label>_Pause</label>
-        <accel>Ctrl+P</accel>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="NextFrame">
-        <label>_Next frame</label>
-        <accel>Ctrl+N</accel>
-      </object>
-      <object class="wxMenuItem" name="Rewind">
-        <label>Re_wind</label>
-        <accel>Ctrl+B</accel>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="ToggleFullscreen">
-        <label>_Fullscreen</label>
-        <bitmap platform="unix" stock_id="gtk-fullscreen"/>
-        <accel>F11</accel>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="EmulatorSpeedupToggle">
-        <label>_Turbo mode</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="VSync">
-        <label>_VSync</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="SyncGameAudio">
-        <label>_Audio sync</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="FrameSkipAuto">
-        <label>_Auto skip frames</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="ApplyPatches">
-        <label>_Auto IPS/UPS/IPF patch</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="PauseWhenInactive">
-        <label>_Pause when inactive</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="separator"/>
       <object class="wxMenu">
         <object class="wxMenuItem" name="LoadGameRecent">
           <label>Most _recent</label>
@@ -253,6 +146,113 @@
         <label>_Save state</label>
       </object>
       <object class="separator"/>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="ImportBatteryFile">
+          <label>_Battery file...</label>
+        </object>
+        <object class="wxMenuItem" name="ImportGamesharkCodeFile">
+          <label>Gameshark _code file...</label>
+        </object>
+        <object class="wxMenuItem" name="ImportGamesharkActionReplaySnapshot">
+          <label>_Gameshark snapshot...</label>
+        </object>
+        <label>_Import</label>
+      </object>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="ExportBatteryFile">
+          <label>_Battery file...</label>
+        </object>
+        <object class="wxMenuItem" name="ExportGamesharkSnapshot">
+          <label>_Gameshark snapshot...</label>
+        </object>
+        <label>_Export</label>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="ScreenCapture">
+        <label>Screen capt_ure...</label>
+      </object>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="RecordSoundStartRecording">
+          <label>Start _sound recording...</label>
+        </object>
+        <object class="wxMenuItem" name="RecordSoundStopRecording">
+          <label>Stop s_ound recording</label>
+        </object>
+        <object class="wxMenuItem" name="RecordAVIStartRecording">
+          <label>Start _video recording...</label>
+        </object>
+        <object class="wxMenuItem" name="RecordAVIStopRecording">
+          <label>Stop v_ideo recording</label>
+        </object>
+        <object class="wxMenuItem" name="RecordMovieStartRecording">
+          <label>Start _game recording...</label>
+        </object>
+        <object class="wxMenuItem" name="RecordMovieStopRecording">
+          <label>Stop g_ame recording</label>
+        </object>
+        <label>_Record</label>
+      </object>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="PlayMovieStartPlaying">
+          <label>Start playing _movie...</label>
+        </object>
+        <object class="wxMenuItem" name="PlayMovieStopPlaying">
+          <label>Stop playing m_ovie</label>
+        </object>
+        <label>_Play</label>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="wxID_CLOSE"/>
+      <object class="wxMenuItem" name="wxID_EXIT"/>
+    </object>
+    <object class="wxMenu">
+      <label>_Emulation</label>
+      <object class="wxMenuItem" name="Pause">
+        <label>_Pause</label>
+        <accel>Ctrl+P</accel>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="NextFrame">
+        <label>_Next frame</label>
+        <accel>Ctrl+N</accel>
+      </object>
+      <object class="wxMenuItem" name="Rewind">
+        <label>Re_wind</label>
+        <accel>Ctrl+B</accel>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="ToggleFullscreen">
+        <label>_Fullscreen</label>
+        <bitmap platform="unix" stock_id="gtk-fullscreen"/>
+        <accel>F11</accel>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="EmulatorSpeedupToggle">
+        <label>_Turbo mode</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="VSync">
+        <label>_VSync</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="SyncGameAudio">
+        <label>_Audio sync</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="FrameSkipAuto">
+        <label>_Auto skip frames</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="ApplyPatches">
+        <label>_Auto IPS/UPS/IPF patch</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="PauseWhenInactive">
+        <label>_Pause when inactive</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="separator"/>
       <object class="wxMenuItem" name="Reset">
         <label>_Reset</label>
         <accel>Ctrl+R</accel>