Mercurial > octave
changeset 11170:a2437f70fe6c
Remove template to allow compilation for MacOS
| author | Kai Habel <kai.habel@gmx.de> |
|---|---|
| date | Sun, 31 Oct 2010 13:28:55 +0100 |
| parents | 51beeeff9027 |
| children | bc3fa8f6c4dc |
| files | src/ChangeLog src/DLD-FUNCTIONS/fltk_backend.cc |
| diffstat | 2 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Oct 30 12:14:27 2010 -0700 +++ b/src/ChangeLog Sun Oct 31 13:28:55 2010 +0100 @@ -1,3 +1,8 @@ +2010-10-31 Kai Habel <kai.habel@gmx.de> + + * fltk-backend.cc (find_uimenu_children): Remove template argument. + (do_find_uimenu_children): New function. + 2010-10-29 David Bateman <dbateman@free.fr> * graphics.cc (octave_value patch::properties::get_color_data
--- a/src/DLD-FUNCTIONS/fltk_backend.cc Sat Oct 30 12:14:27 2010 -0700 +++ b/src/DLD-FUNCTIONS/fltk_backend.cc Sun Oct 31 13:28:55 2010 +0100 @@ -316,13 +316,26 @@ } return (-1); } + + Matrix find_uimenu_children (uimenu::properties& uimenup) const + { + Matrix uimenu_childs = uimenup.get_children (); + Matrix retval = do_find_uimenu_children (uimenu_childs); + return retval; + } - template <class T> - Matrix find_uimenu_children (T& prop) const + Matrix find_uimenu_children (figure::properties& figp) const + { + Matrix uimenu_childs = figp.get_children (); + Matrix retval = do_find_uimenu_children (uimenu_childs); + return retval; + } + + Matrix do_find_uimenu_children (Matrix uimenu_childs) const { octave_idx_type k = 0; - Matrix uimenu_childs = prop.get_children (); + Matrix pos = Matrix (uimenu_childs.numel (), 1); for (octave_idx_type ii = 0; ii < uimenu_childs.numel (); ii++)