summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcomex <comexk@gmail.com>2014-10-16 20:12:35 -0400
committercomex <comexk@gmail.com>2014-10-16 20:12:35 -0400
commit4e8cc952bb11a9b1aece8966d9bbb13d45501fbf (patch)
treed4a177fee02681eb4f04a4d92da4ea4db2ef6896
parenteb865cae20f0ebba215158909977cdbab7b4142a (diff)
parent2ce90f267cabda876137626ea3f47bc947aa4a95 (diff)
Merge pull request #1247 from Stevoisiak/WiimoteSubmenu
Moved "Connect Wiimote" options into submenu
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index fd5ca74bea..135d9c203d 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -256,11 +256,14 @@ wxMenuBar* CFrame::CreateMenu()
toolsMenu->Append(IDM_FIFOPLAYER, _("Fifo Player"));
toolsMenu->AppendSeparator();
- toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE1, GetMenuLabel(HK_WIIMOTE1_CONNECT));
- toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE2, GetMenuLabel(HK_WIIMOTE2_CONNECT));
- toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE3, GetMenuLabel(HK_WIIMOTE3_CONNECT));
- toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE4, GetMenuLabel(HK_WIIMOTE4_CONNECT));
- toolsMenu->AppendCheckItem(IDM_CONNECT_BALANCEBOARD, GetMenuLabel(HK_BALANCEBOARD_CONNECT));
+ wxMenu* wiimoteMenu = new wxMenu;
+ toolsMenu->AppendSubMenu(wiimoteMenu, _("Connect Wiimotes"));
+ wiimoteMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE1, GetMenuLabel(HK_WIIMOTE1_CONNECT));
+ wiimoteMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE2, GetMenuLabel(HK_WIIMOTE2_CONNECT));
+ wiimoteMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE3, GetMenuLabel(HK_WIIMOTE3_CONNECT));
+ wiimoteMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE4, GetMenuLabel(HK_WIIMOTE4_CONNECT));
+ wiimoteMenu->AppendSeparator();
+ wiimoteMenu->AppendCheckItem(IDM_CONNECT_BALANCEBOARD, GetMenuLabel(HK_BALANCEBOARD_CONNECT));
menubar->Append(toolsMenu, _("&Tools"));