diff --git a/src/BizHawk.Client.EmuHawk/LogWindow.Designer.cs b/src/BizHawk.Client.EmuHawk/LogWindow.Designer.cs index ee28e0011f..2e26086757 100644 --- a/src/BizHawk.Client.EmuHawk/LogWindow.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/LogWindow.Designer.cs @@ -139,9 +139,7 @@ namespace BizHawk.Client.EmuHawk // // MenuStrip // - this.MenuStrip.Name = "MenuStrip"; this.MenuStrip.TabIndex = 9; - this.MenuStrip.Text = "menuStrip1"; // // LogWindow // diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs index 89c2e23182..ec6fa9a236 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -405,9 +405,7 @@ namespace BizHawk.Client.EmuHawk this.amstradCPCToolStripMenuItem, this.HelpSubMenu}); this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; - this.MainformMenu.Name = "MainformMenu"; this.MainformMenu.TabIndex = 0; - this.MainformMenu.Text = "menuStrip1"; this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate); this.MainformMenu.MenuDeactivate += new System.EventHandler(this.MainformMenu_MenuDeactivate); // diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs index 50b1ac35ad..7a707a5593 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs @@ -149,9 +149,7 @@ namespace BizHawk.Client.EmuHawk this.FileSubMenu, this.OptionsSubMenu, this.helpToolStripMenuItem}); - this.BotMenu.Name = "BotMenu"; this.BotMenu.TabIndex = 0; - this.BotMenu.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs b/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs index 273dbba976..8685dd6d09 100644 --- a/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs @@ -63,9 +63,7 @@ namespace BizHawk.Client.EmuHawk // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 2; - this.menuStrip1.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs index 685f7b25fa..1a31a2b890 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs @@ -157,9 +157,7 @@ namespace BizHawk.Client.EmuHawk this.FileSubMenu, this.CheatsSubMenu, this.OptionsSubMenu}); - this.CheatsMenu.Name = "CheatsMenu"; this.CheatsMenu.TabIndex = 2; - this.CheatsMenu.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs index 1ba50d3615..8bf4c03706 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs @@ -70,9 +70,7 @@ namespace BizHawk.Client.EmuHawk this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.DebugSubMenu}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 1; - this.menuStrip1.Text = "menuStrip1"; // // fileToolStripMenuItem // diff --git a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs index 101576c67f..3102a09833 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs @@ -159,9 +159,7 @@ namespace BizHawk.Client.EmuHawk // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 11; - this.menuStrip1.Text = "menuStrip1"; // // fileToolStripMenuItem // diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs index b9a042cdbb..f64390e146 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs @@ -105,9 +105,7 @@ namespace BizHawk.Client.EmuHawk this.EditMenuItem, this.OptionsSubMenu, this.SettingsSubMenu}); - this.HexMenuStrip.Name = "HexMenuStrip"; this.HexMenuStrip.TabIndex = 1; - this.HexMenuStrip.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs index 20f480cda5..8ee4500f93 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs @@ -178,9 +178,7 @@ namespace BizHawk.Client.EmuHawk this.ScriptSubMenu, this.SettingsSubMenu, this.HelpSubMenu}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 1; - this.menuStrip1.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs index d320a7d086..d75f0148d9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs @@ -144,9 +144,7 @@ namespace BizHawk.Client.EmuHawk // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 5; - this.menuStrip1.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs index 2152fa2298..1cfb062f8f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs @@ -127,9 +127,7 @@ namespace BizHawk.Client.EmuHawk // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 1; - this.menuStrip1.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs index 86782a244e..7d6c252d01 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs @@ -452,10 +452,8 @@ namespace BizHawk.Client.EmuHawk this.FileSubMenu, this.PatternSubMenu, this.SettingsSubMenu}); - this.NesPPUMenu.Name = "NesPPUMenu"; this.NesPPUMenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); this.NesPPUMenu.TabIndex = 10; - this.NesPPUMenu.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs index e036f02f7d..29a6001530 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs @@ -61,9 +61,7 @@ namespace BizHawk.Client.EmuHawk // this.PceBgViewerMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ViewerSubMenu}); - this.PceBgViewerMenu.Name = "PceBgViewerMenu"; this.PceBgViewerMenu.TabIndex = 2; - this.PceBgViewerMenu.Text = "menuStrip1"; // // ViewerSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs index 92014e8f26..911f368c54 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs @@ -247,9 +247,7 @@ namespace BizHawk.Client.EmuHawk // // SoundMenuStrip // - this.SoundMenuStrip.Name = "SoundMenuStrip"; this.SoundMenuStrip.TabIndex = 4; - this.SoundMenuStrip.Text = "menuStrip1"; // // PCESoundDebugger // diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs index 1e03a24aca..c94f865395 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs @@ -126,9 +126,7 @@ namespace BizHawk.Client.EmuHawk // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 8; - this.menuStrip1.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs index 20022af196..6bf1ac08c9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs @@ -115,9 +115,7 @@ namespace BizHawk.Client.EmuHawk // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 5; - this.menuStrip1.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs index d45053c890..e50b2b99f8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs @@ -275,9 +275,7 @@ namespace BizHawk.Client.EmuHawk // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 33; - this.menuStrip1.Text = "menuStrip1"; // // fileToolStripMenuItem // diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index dfbebc5702..9ca029fcc1 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -214,9 +214,7 @@ namespace BizHawk.Client.EmuHawk this.SettingsSubMenu, this.ColumnsSubMenu, this.HelpSubMenu}); - this.TASMenu.Name = "TASMenu"; this.TASMenu.TabIndex = 0; - this.TASMenu.Text = "menuStrip1"; this.TASMenu.MenuActivate += new System.EventHandler(this.TASMenu_MenuActivate); this.TASMenu.MenuDeactivate += new System.EventHandler(this.TASMenu_MenuDeactivate); // diff --git a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs index bbb0c97a96..e320d33b15 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs @@ -178,9 +178,7 @@ namespace BizHawk.Client.EmuHawk this.toolStripMenuItem1, this.KeyPadSubMenu, this.SettingsSubMenu}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 0; - this.menuStrip1.Text = "menuStrip1"; // // KeyPadSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs index 634f05f649..9e0e6f96b6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs @@ -125,9 +125,7 @@ namespace BizHawk.Client.EmuHawk this.FileSubMenu, this.EditSubMenu, this.OptionsSubMenu}); - this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.TabIndex = 2; - this.menuStrip1.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs index a10ddf7548..5a80e21a75 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs @@ -97,9 +97,7 @@ namespace BizHawk.Client.EmuHawk this.PadMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PadsSubMenu, this.SettingsSubMenu}); - this.PadMenu.Name = "PadMenu"; this.PadMenu.TabIndex = 7; - this.PadMenu.Text = "menuStrip1"; // // PadsSubMenu // diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs index 81b25c69cf..489bb99ad3 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs @@ -272,9 +272,7 @@ namespace BizHawk.Client.EmuHawk this.settingsToolStripMenuItem, this.searchToolStripMenuItem, this.optionsToolStripMenuItem}); - this.RamSearchMenu.Name = "RamSearchMenu"; this.RamSearchMenu.TabIndex = 4; - this.RamSearchMenu.Text = "menuStrip1"; // // fileToolStripMenuItem // diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs index fa21e8e656..5a181c12a6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs @@ -411,9 +411,7 @@ namespace BizHawk.Client.EmuHawk this.FileSubMenu, this.WatchesSubMenu, this.OptionsSubMenu}); - this.RamWatchMenu.Name = "RamWatchMenu"; this.RamWatchMenu.TabIndex = 3; - this.RamWatchMenu.Text = "menuStrip1"; // // FileSubMenu // diff --git a/src/BizHawk.WinForms.Controls/MenuEx/MenuStripEx.cs b/src/BizHawk.WinForms.Controls/MenuEx/MenuStripEx.cs index f4b93ee65e..e1b6ee1d09 100644 --- a/src/BizHawk.WinForms.Controls/MenuEx/MenuStripEx.cs +++ b/src/BizHawk.WinForms.Controls/MenuEx/MenuStripEx.cs @@ -16,6 +16,12 @@ namespace BizHawk.WinForms.Controls [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public new Point Location => new Point(0, 0); + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] + public new string Text => ""; + + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] + public new string Name => Guid.NewGuid().ToString(); + protected override void WndProc(ref Message m) { base.WndProc(ref m);