Mercurial > octave-nkf
changeset 17868:da3586730ea0
Remove Help menu from FLTK menubar.
* scripts/plot/util/allchild.m, scripts/plot/util/findall.m:
Correct %!tests to pass with new menubar.
* scripts/plot/util/private/__add_default_menu__.m: Remove Help uimenu.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 06 Nov 2013 19:44:46 -0800 |
| parents | 49d573a1deda |
| children | e8330a9e8c78 |
| files | scripts/plot/util/allchild.m scripts/plot/util/findall.m scripts/plot/util/private/__add_default_menu__.m |
| diffstat | 3 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/util/allchild.m Wed Nov 06 19:22:02 2013 -0500 +++ b/scripts/plot/util/allchild.m Wed Nov 06 19:44:46 2013 -0800 @@ -53,7 +53,7 @@ %! unwind_protect %! l = line; %! kids = allchild (hf); -%! assert (get (kids, "type"), {"axes"; "uimenu"; "uimenu"; "uimenu"}); +%! assert (get (kids, "type"), {"axes"; "uimenu"; "uimenu"}); %! unwind_protect_cleanup %! close (hf); %! graphics_toolkit (toolkit);
--- a/scripts/plot/util/findall.m Wed Nov 06 19:22:02 2013 -0500 +++ b/scripts/plot/util/findall.m Wed Nov 06 19:44:46 2013 -0800 @@ -56,7 +56,7 @@ %! unwind_protect %! h = findall (hf); %! all_handles(1) = {"figure"}; -%! all_handles(2:14,1) = {"uimenu"}; +%! all_handles(2:12,1) = {"uimenu"}; %! assert (get (h, "type"), all_handles); %! unwind_protect_cleanup %! close (hf);
--- a/scripts/plot/util/private/__add_default_menu__.m Wed Nov 06 19:22:02 2013 -0500 +++ b/scripts/plot/util/private/__add_default_menu__.m Wed Nov 06 19:44:46 2013 -0800 @@ -54,10 +54,6 @@ uimenu (gm, "label", "Rotate+Zoom", "callback", @guimode_cb); uimenu (gm, "label", "None", "callback", @guimode_cb); - __h = uimenu (fig, "label", "&Help", "handlevisibility", "off", - "tag", "__default_menu__"); - uimenu (__h, "label", "A&bout", "enable", "off"); - ## FIXME: This drawnow () must occur after at least one menu item has ## been defined to avoid sizing issues in new figures. ## This may lead to flicker. The real fix must be in the C++ code.