Skip to content
Permalink
Browse files

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`.
  • Loading branch information
denisfa authored and rkitover committed Sep 16, 2019
1 parent 0710709 commit 531172c4bec02f0a06029d1ac47d1989ef6111b5
Showing with 7 additions and 1 deletion.
  1. +6 −0 src/wx/guiinit.cpp
  2. +1 −1 src/wx/xrc/MainMenu.xrc
@@ -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");
@@ -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>

0 comments on commit 531172c

Please sign in to comment.
You can’t perform that action at this time.