# HG changeset patch # User Kai Habel # Date 1288528135 -3600 # Node ID a2437f70fe6c6adcb7cb6b549b17c5189b7f9cec # Parent 51beeeff9027ff5cb21d6e0d9b86a2dd2f4952af Remove template to allow compilation for MacOS diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-10-31 Kai Habel + + * fltk-backend.cc (find_uimenu_children): Remove template argument. + (do_find_uimenu_children): New function. + 2010-10-29 David Bateman * graphics.cc (octave_value patch::properties::get_color_data diff --git a/src/DLD-FUNCTIONS/fltk_backend.cc b/src/DLD-FUNCTIONS/fltk_backend.cc --- a/src/DLD-FUNCTIONS/fltk_backend.cc +++ b/src/DLD-FUNCTIONS/fltk_backend.cc @@ -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 - 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++)