toolbar menus now add/remove symmetrical, now order 1

[lttv.git] / ltt / branches / poly / lttv / modules / gui / lttvwindow / lttvwindow / menu.c

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/menu.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/menu.c
index 66033323e144a493b28b9002a1f9ebd1a5e481bd..7437c4aad58860fc26ef878d0265e28b226dba6e 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/menu.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/menu.c
@@ -21,7 +21,7 @@
 
 
 inline LttvMenus *lttv_menus_new() {
-  return g_array_new(FALSE, FALSE, sizeof(lttv_menu_closure));
+  return g_array_new(FALSE, FALSE, sizeof(LttvMenuClosure));
 }
 
 /* MD: delete elements of the array also, but don't free pointed addresses
@@ -32,9 +32,9 @@ inline void lttv_menus_destroy(LttvMenus *h) {
   g_array_free(h, TRUE);
 }
 
-inline void lttv_menus_add(LttvMenus *h, lttvwindow_viewer_constructor f, char* menuPath, char* menuText)
+inline LttvMenuClosure lttv_menus_add(LttvMenus *h, lttvwindow_viewer_constructor f, char* menuPath, char* menuText, GtkWidget *widget)
 {
-  lttv_menu_closure c;
+  LttvMenuClosure c;
 
   /* if h is null, do nothing, or popup a warning message */
   if(h == NULL)return;
@@ -42,21 +42,29 @@ inline void lttv_menus_add(LttvMenus *h, lttvwindow_viewer_constructor f, char*
   c.con = f;
   c.menuPath = menuPath;
   c.menuText = menuText;
+  c.widget = widget;
   g_array_append_val(h,c);
+
+  return c;
 }
 
-gboolean lttv_menus_remove(LttvMenus *h, lttvwindow_viewer_constructor f)
+GtkWidget *lttv_menus_remove(LttvMenus *h, lttvwindow_viewer_constructor f)
 {
-  lttv_menu_closure * tmp;
+  LttvMenuClosure * tmp;
   gint i;
+  GtkWidget *widget;
+  
   for(i=0;i<h->len;i++){
-    tmp = & g_array_index(h, lttv_menu_closure, i);
-    if(tmp->con == f)break;
+    tmp = & g_array_index(h, LttvMenuClosure, i);
+    if(tmp->con == f) {
+      widget = tmp->widget;
+      break;
+    }
   }
   if(i<h->len){
     g_array_remove_index(h, i);
-    return TRUE;
-  }else return FALSE;
+    return widget;
+  }else return NULL;
   
 }