Fix displaying of link menu when ENABLE_LINK=NO.

We disable the items, but not the menu. So, there was an empty list on `Options` > `Link` > `Type`.
visualboyadvance-m · Sep 16, 2019 · 531172c · 531172c
1 parent 0710709
commit 531172c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
@@ -2930,6 +2930,12 @@ bool MainFrame::BindControls()
         gdbmi->GetMenu()->Remove(gdbmi);
         gdbmi = NULL;
 #endif
+#ifdef NO_LINK
+        // remove this item from the menu completely
+        wxMenuItem* linkmi = XRCITEM("LinkMenu");
+        linkmi->GetMenu()->Remove(linkmi);
+        linkmi = NULL;
+#endif
 
         // if a recent menu is present, save its location
         wxMenuItem* recentmi = XRCITEM("RecentMenu");

diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
@@ -260,7 +260,7 @@
     </object>
     <object class="wxMenu">
       <label>_Options</label>
-      <object class="wxMenu">
+      <object class="wxMenu" name="LinkMenu">
         <label>_Link</label>
         <object class="wxMenuItem" name="LanLink">
           <label>Start _Network Link ...</label>