From 421f9113716c11b86ab781410c04daebc7c6d263 Mon Sep 17 00:00:00 2001
From: skidau <skidau@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Fri, 8 May 2015 14:39:54 +0000
Subject: [PATCH] Removed the GBA washed colors option as it did not do
 anything. Removed the broken full screen resolution selection. Added some
 separators in the menu. Fixed a path problem in the wx CMakeLists.txt

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1407 a31d4220-a93d-0410-bf67-fe4944624d44
---
 src/wx/CMakeLists.txt        |  2 +-
 src/wx/cmdevents.cpp         |  6 ------
 src/wx/guiinit.cpp           |  3 ---
 src/wx/opts.cpp              |  1 -
 src/wx/opts.h                |  1 -
 src/wx/xrc/DisplayConfig.xrc | 36 ------------------------------------
 src/wx/xrc/MainMenu.xrc      | 28 ++++++++++++++++++----------
 7 files changed, 19 insertions(+), 58 deletions(-)

diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index 9c951e0c..982cd1e3 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -74,8 +74,8 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/wxvbam.xpm DESTINATION ${CMAKE_CURRE
 # wxrc does not support xrs files in -c output (> 10x compression)
 # so do it manually using slow but portable bin2c.cmake script
 ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
-                   COMMAND wxrc ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.xrc -o wxvbam.xrs
                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                   COMMAND wxrc ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.xrc -o wxvbam.xrs
 		   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.xrc)
 ADD_CUSTOM_COMMAND(OUTPUT builtin-xrc.h
                    COMMAND ${CMAKE_COMMAND} -DINFILE=wxvbam.xrs -DOUTFILE=builtin-xrc.h -DVARNAME=builtin_xrs -P ${CMAKE_CURRENT_SOURCE_DIR}/bin2c.cmake
diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index 6422678a..8e130fcd 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -2228,12 +2228,6 @@ EVT_HANDLER(Printer, "Enable printer emulation")
 	update_opts();
 }
 
-EVT_HANDLER(Color, "Emulate washed colors of LCD")
-{
-	GetMenuOptionBool("Color", gopts.gbcColorOption);
-	update_opts();
-}
-
 EVT_HANDLER(PrintGather, "Automatically gather a full page before printing")
 {
 	GetMenuOptionBool("PrintGather", gopts.print_auto_page);
diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index f40a3e5b..94c655c1 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -2937,9 +2937,6 @@ bool MainFrame::BindControls()
 			// validator just for this, and spinctrl is good enough.
 			getsc("DefaultScale", gopts.video_scale);
 			getsc("MaxScale", maxScale);
-			// fs modes should be filled in at popup time
-			// since they may change based on what screen is current
-			SafeXRCCTRL<wxChoice>(d, "FullscreenMode");
 
 			/// Advanced
 			getrbi("OutputSimple", gopts.render_method, RND_SIMPLE);
diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index d713a3d2..13800f6a 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -149,7 +149,6 @@ opt_desc opts[] = {
     /// GB
     STROPT ("GB/BiosFile", "", wxTRANSLATE("BIOS file to use for GB, if enabled"), gopts.gb_bios),
     STROPT ("GB/GBCBiosFile", "", wxTRANSLATE("BIOS file to use for GBC, if enabled"), gopts.gbc_bios),
-    BOOLOPT("GB/LCDColor", "Color", wxTRANSLATE("Emulate washed colors of LCD"), gopts.gbcColorOption),
     {   wxT("GB/Palette0"), "", wxTRANSLATE("The default palette, as 8 comma-separated 4-digit hex integers (rgb555).") },
     {   wxT("GB/Palette1"), "", wxTRANSLATE("The first user palette, as 8 comma-separated 4-digit hex integers (rgb555).") },
     {   wxT("GB/Palette2"), "", wxTRANSLATE("The second user palette, as 8 comma-separated 4-digit hex integers (rgb555).") },
diff --git a/src/wx/opts.h b/src/wx/opts.h
index f9bf6f56..1f90cdf1 100644
--- a/src/wx/opts.h
+++ b/src/wx/opts.h
@@ -24,7 +24,6 @@ extern struct opts_t {
     /// GB
     wxString gb_bios;
     wxString gbc_bios;
-    bool gbcColorOption;
     // u16 systemGbPalette[8*3];
     bool print_auto_page, print_screen_cap;
     wxString gb_rom_dir;
diff --git a/src/wx/xrc/DisplayConfig.xrc b/src/wx/xrc/DisplayConfig.xrc
index 1448b060..d4dc1707 100644
--- a/src/wx/xrc/DisplayConfig.xrc
+++ b/src/wx/xrc/DisplayConfig.xrc
@@ -90,42 +90,6 @@
             </object>
             <flag>wxEXPAND</flag>
           </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Full screen</label>
-              <font>
-                <weight>bold</weight>
-              </font>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Video Mode :</label>
-                    </object>
-                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxChoice" name="FullscreenMode"/>
-                    <option>1</option>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                  <orient>wxHORIZONTAL</orient>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
         </object>
       </object>
       <label>Zoom</label>
diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
index 4474feea..70dd59bc 100644
--- a/src/wx/xrc/MainMenu.xrc
+++ b/src/wx/xrc/MainMenu.xrc
@@ -313,14 +313,16 @@
         <object class="wxMenuItem" name="DisplayConfigure">
           <label>_Configure ...</label>
         </object>
-        <object class="wxMenuItem" name="Color">
-          <label>_GB washed colors</label>
-          <checkable>1</checkable>
-        </object>        
+        <object class="separator"/>
         <object class="wxMenuItem" name="Fullscreen">
           <label>_Fullscreen mode</label>
           <checkable>1</checkable>
         </object>
+        <object class="wxMenuItem" name="RetainAspect">
+          <label>_Retain aspect ratio</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="separator"/>
         <object class="wxMenuItem" name="Bilinear">
           <label>_Bilinear filter</label>
           <checkable>1</checkable>
@@ -329,16 +331,13 @@
           <label>_Multithread filter</label>
           <checkable>1</checkable>
         </object>
-        <object class="wxMenuItem" name="RetainAspect">
-          <label>_Retain aspect ratio</label>
-          <checkable>1</checkable>
-        </object>
+        <object class="separator"/>
         <object class="wxMenuItem" name="NoStatusMsg">
-          <label>_Disable on-screen status messages</label>
+          <label>_Disable on-screen display</label>
           <checkable>1</checkable>
         </object>
         <object class="wxMenuItem" name="Transparent">
-          <label>_Transparent on-screen messages</label>
+          <label>_Transparent on-screen display</label>
           <checkable>1</checkable>
         </object>
       </object>
@@ -347,10 +346,12 @@
         <object class="wxMenuItem" name="SoundConfigure">
           <label>_Configure ...</label>
         </object>
+        <object class="separator"/>
         <object class="wxMenuItem" name="GBASoundInterpolation">
           <label>_GBA sound interpolation</label>
           <checkable>1</checkable>
         </object>
+        <object class="separator"/>        
         <object class="wxMenuItem" name="GBEnhanceSound">
           <label>_GB sound enhancement</label>
           <checkable>1</checkable>
@@ -369,6 +370,7 @@
         <object class="wxMenuItem" name="JoypadConfigure">
           <label>_Configure ...</label>
         </object>
+        <object class="separator"/>        
         <object class="wxMenu">
           <label>_Autofire</label>
           <object class="wxMenuItem" name="JoypadAutofireA">
@@ -398,6 +400,7 @@
         <object class="wxMenuItem" name="GameBoyAdvanceConfigure">
           <label>Configure ...</label>
         </object>
+        <object class="separator"/>        
         <object class="wxMenuItem" name="RTC">
           <label>_Real-time clock</label>
           <checkable>1</checkable>
@@ -416,6 +419,7 @@
         <object class="wxMenuItem" name="GameBoyConfigure">
           <label>Configure ...</label>
         </object>
+        <object class="separator"/>
         <object class="wxMenuItem" name="Printer">
           <label>_GB printer</label>
           <checkable>1</checkable>
@@ -428,6 +432,7 @@
           <label>_Save printouts as screen captures</label>
           <checkable>1</checkable>
         </object>
+        <object class="separator"/>
         <object class="wxMenuItem" name="BootRomGB">
           <label>_Use GB BIOS file</label>
           <checkable>1</checkable>
@@ -459,6 +464,7 @@
           <label>Find c_heat ...</label>
           <accel>Ctrl+F</accel>
         </object>
+        <object class="separator"/>        
         <object class="wxMenuItem" name="CheatsAutoSaveLoad">
           <label>A_utomatically save/load cheats</label>
           <checkable>1</checkable>
@@ -473,6 +479,7 @@
         <object class="wxMenuItem" name="DebugGDBBreak">
           <label>_Break into GDB</label>
         </object>
+        <object class="separator"/>
         <object class="wxMenuItem" name="DebugGDBPort">
           <label>_Configure port...</label>
         </object>
@@ -480,6 +487,7 @@
           <label>_Break on load</label>
           <checkable>1</checkable>
         </object>
+        <object class="separator"/>
         <object class="wxMenuItem" name="DebugGDBDisconnect">
           <label>_Disconnect</label>
         </object>