Mercurial > octave-nkf
changeset 20143:de1377a638d7
Let annotation work with fltk again
* __init_fltk__.cc (fltk_graphics_toolkit::uimenu_set_fltk_label) silently omit menus who's parents are uicontextmenus.
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Tue, 21 Apr 2015 00:24:35 +0200 |
| parents | f1f6d5eab46f |
| children | 5a4717862648 248f2f2e7d48 |
| files | libinterp/dldfcn/__init_fltk__.cc |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_fltk__.cc Mon Apr 20 22:13:09 2015 +0200 +++ b/libinterp/dldfcn/__init_fltk__.cc Tue Apr 21 00:24:35 2015 +0200 @@ -2166,7 +2166,7 @@ (go.get_properties ()).get_fltk_label () + "/" + fltk_label; - else if (go.isa ("figure")) + else if (go.isa ("figure") || go.isa ("uicontextmenu")) ; else error ("unexpected parent object\n");