HBMAMEUI: Made BIOS menu wider; disabled newui and removed menu option.

Author: Robbbert

src/osd/windows/window.cpp

@@ -987,11 +987,11 @@ int win_window_info::complete_create()
 	osd_rect monitorbounds = monitor()->position_size();
 
 	// create the window menu if needed
-	if (downcast<windows_options &>(machine().options()).menu())
-	{
-		if (win_create_menu(machine(), &menu))
-			return 1;
-	}
+//	if (downcast<windows_options &>(machine().options()).menu())
+//	{
+//		if (win_create_menu(machine(), &menu))
+//			return 1;
+//	}
 
 	// are we in worker UI mode?
 	HWND hwnd;

src/osd/windows/winmain.cpp

@@ -119,7 +119,7 @@ const options_entry windows_options::s_option_entries[] =
 
 	// video options
 	{ nullptr,                                        nullptr,    core_options::option_type::HEADER,     "WINDOWS VIDEO OPTIONS" },
-	{ WINOPTION_MENU,                                 "0",        core_options::option_type::BOOLEAN,    "enables menu bar if available by UI implementation" },
+//	{ WINOPTION_MENU,                                 "0",        core_options::option_type::BOOLEAN,    "enables menu bar if available by UI implementation" },
 	{ WINOPTION_ATTACH_WINDOW,                        "",         core_options::option_type::STRING,     "attach to arbitrary window" },
 
 	// post-processing options

src/osd/windows/winmain.h

@@ -22,7 +22,7 @@
 #define WINOPTION_PROFILE               "profile"
 
 // video options
-#define WINOPTION_MENU                  "menu"
+//#define WINOPTION_MENU                  "menu"
 #define WINOPTION_ATTACH_WINDOW         "attach_window"
 
 // core post-processing options
@@ -134,7 +134,7 @@ class windows_options : public osd_options
 	int profile() const { return int_value(WINOPTION_PROFILE); }
 
 	// video options
-	bool menu() const { return bool_value(WINOPTION_MENU); }
+	//bool menu() const { return bool_value(WINOPTION_MENU); }
 	const char *attach_window() const { return value(WINOPTION_ATTACH_WINDOW); }
 
 	// core post-processing options

src/osd/winui/hbmameui.rc

@@ -933,7 +933,7 @@ BEGIN
     CONTROL         "Coin lockout",IDC_COINLOCKOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,100,96,10,0,HIDC_COINLOCKOUT
     CONTROL         "Enable cheats",IDC_CHEAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,112,86,10,0,HIDC_CHEAT
     CONTROL         "Output log to Logfile",IDC_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,124,93,10,0,HIDC_LOG
-    CONTROL         "Show Menu",IDC_SHOW_MENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,136,86,10,0
+//    CONTROL         "Show Menu",IDC_SHOW_MENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,136,86,10,0
     CONTROL         "Use Natural Keyboard",IDC_NATURAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,148,86,10,0
     CONTROL         "Enable HLSL with D3D",IDC_HLSL_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,160,86,10,0
     CONTROL         "Allow Joystick Contradictions",IDC_JOY_CONTRA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,172,110,10,0
@@ -944,8 +944,8 @@ BEGIN
     GROUPBOX        "Override artwork",IDC_STATIC,119,80,90,28
     EDITTEXT        IDC_ARTWORK_OVERRIDE,125,90,78,14,ES_AUTOHSCROLL | WS_BORDER,0
     CONTROL         "Crop artwork",IDC_ARTWORK_CROP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,119,110,53,10,0,HIDC_ARTWORK_CROP
-    GROUPBOX        "BIOS",IDC_STATIC,113,128,102,28
-    COMBOBOX        IDC_BIOS,119,138,90,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_BIOS
+    GROUPBOX        "BIOS",IDC_STATIC,4,196,211,28
+    COMBOBOX        IDC_BIOS,9,206,200,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_BIOS
     GROUPBOX        "Thread Priority",IDC_HIGH_PRIORITY_TEXT,113,160,102,34
     CONTROL         "TPSlider",IDC_HIGH_PRIORITY,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,119,170,75,10,0,HIDC_HIGH_PRIORITY
     LTEXT           "idle",IDC_STATIC,123,180,12,8

src/osd/winui/newuires.h

@@ -42,7 +42,7 @@
 #define ID_HELP_ABOUTSYSTEM             3140
 #define ID_FILE_OLDUI                   3141
 #define ID_FILE_UIACTIVE                3142
-#define IDC_SHOW_MENU                   3143
+//#define IDC_SHOW_MENU                   3143
 #define IDI_ICON_CART                   3200
 #define IDI_ICON_HARD                   3201
 #define IDI_ICON_CASS                   3202

src/osd/winui/properties.cpp

@@ -2647,7 +2647,7 @@ static void BuildDataMap(void)
 	datamap_add(properties_datamap, IDC_DUAL_LIGHTGUN,			DM_BOOL,	WINOPTION_DUAL_LIGHTGUN);
 
 	// show menu
-	datamap_add(properties_datamap, IDC_SHOW_MENU,				DM_BOOL,	WINOPTION_MENU);
+//	datamap_add(properties_datamap, IDC_SHOW_MENU,				DM_BOOL,	WINOPTION_MENU);
 
 	// set up callbacks
 	datamap_set_callback(properties_datamap, IDC_ROTATE,		DCT_READ_CONTROL,		RotateReadControl);