# HG changeset patch
# User Kai Habel <kai.habel@gmx.de>
# Date 1289247742 -3600
# Node ID 51e6ac3e5afcebde4866d5d664d7760a84ffab2c
# Parent  83d268af65cbc84754e33f52e32eaf828affe5be
Code fixes for uimenu

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-08  Kai Habel  <kai.habel@gmx.de>
+
+	* fltk-backend.cc (do_find_uimenu_children): Simplify code, Remove 
+	unused code. (update_submenu): Remove unused function.
+	(add_to_menu (uimenu::properties&)): Simplify code. Get properties for valid objects 
+	only. (add_to_menu (figure::properties&)): Dito.
+	(remove_from_menu (T_prop&)): Dito.
+
 2010-11-03  Ben Abbott <bpabbott@mac.com>
 
 	* gl-render.cc: Do not give rendering error for uimenus.
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
@@ -340,19 +340,13 @@
       
       for (octave_idx_type ii = 0; ii < uimenu_childs.numel (); ii++)
       {
-        graphics_handle kid = uimenu_childs (ii);
+        graphics_object kidgo = gh_manager::get_object (uimenu_childs (ii));
         
-        if (gh_manager::is_handle_visible (kid))
-          {  
-            graphics_object kidgo = gh_manager::get_object (kid);
-            if (kidgo.isa ("uimenu"))
-              {
-                uimenu_childs(k) = uimenu_childs(ii);
-                pos(k++) =
-                  dynamic_cast<uimenu::properties&> (kidgo.get_properties ()).get_position ();
-                std::string lbl =
-                  dynamic_cast<uimenu::properties&> (kidgo.get_properties ()).get_fltk_label ();
-              }
+        if (kidgo.valid_object() && kidgo.isa ("uimenu"))
+          {
+            uimenu_childs(k) = uimenu_childs(ii);
+            pos(k++) =
+              dynamic_cast<uimenu::properties&> (kidgo.get_properties ()).get_position ();
           }
       }
       
@@ -368,19 +362,6 @@
       return retval;
     }
     
-  void update_submenu (uimenu::properties& uimenup)
-    {
-      Matrix uimenu_ch = find_uimenu_children (uimenup);
-
-      if (uimenu_ch.numel () > 0) 
-        {
-          std::string fltk_label = uimenup.get_fltk_label ();
-          int idx = find_index_by_name (fltk_label.c_str ());
-          Fl_Menu_Item* item = const_cast<Fl_Menu_Item*>(&menubar->menu () [idx]);
-          menubar->mode(idx, item->flags|FL_SUBMENU);
-        }
-    }
-
   void delete_entry(uimenu::properties& uimenup)
     {
       std::string fltk_label = uimenup.get_fltk_label ();
@@ -491,7 +472,7 @@
     {
 
       std::string fltk_label = uimenup.get_fltk_label ();
-      
+
       if (!fltk_label.empty ())
         {
           bool item_added = false;
@@ -549,17 +530,16 @@
       update_enable (uimenup);
       update_visible (uimenup);
       update_seperator (uimenup);
-
+      
       for (octave_idx_type ii = 0; ii < len; ii++)
         {
-          graphics_handle kid = kids (len - (ii + 1));
-          graphics_object kgo = gh_manager::get_object (kid);
-          uimenu::properties& kprop = dynamic_cast<uimenu::properties&>(kgo.get_properties ());
+          graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1)));
           if (kgo.valid_object ())
-            add_to_menu (kprop);
+            {
+              uimenu::properties& kprop = dynamic_cast<uimenu::properties&>(kgo.get_properties ());
+              add_to_menu (kprop);
+            }
         }
-      
-      
     }
 
   void add_to_menu (figure::properties& figp)
@@ -569,11 +549,13 @@
       menubar->clear ();      
       for (octave_idx_type ii = 0; ii < len; ii++)
         {
-          graphics_handle kid = kids (len - (ii + 1));
-          graphics_object kgo = gh_manager::get_object (kid);
-          uimenu::properties& kprop = dynamic_cast<uimenu::properties&>(kgo.get_properties ());
+          graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1)));
+
           if (kgo.valid_object ())
-            add_to_menu (kprop);
+            {
+              uimenu::properties& kprop = dynamic_cast<uimenu::properties&>(kgo.get_properties ());
+              add_to_menu (kprop);
+            }
         }
     }
 
@@ -587,11 +569,13 @@
 
       for (octave_idx_type ii = 0; ii < len; ii++)
         {
-          graphics_handle kid = kids (len - (ii + 1));
-          graphics_object kgo = gh_manager::get_object (kid);
-          uimenu::properties kprop = dynamic_cast<uimenu::properties&>(kgo.get_properties ());
+          graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1)));
+
           if (kgo.valid_object ())
-            remove_from_menu (kprop);
+            {
+              uimenu::properties kprop = dynamic_cast<uimenu::properties&>(kgo.get_properties ());
+              remove_from_menu (kprop);
+            }
         }
 
       if (type.compare("uimenu") == 0)