detailed event list redesign

[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 7f6ba8e3d59c6df11d3fa1f552ff4d9735a0ff12..5235acaaa61acdde2a1de3d3228ab8a2451ab7f0 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/menu.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/menu.c
@@ -16,48 +16,58 @@
  * MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <lttv/lttv.h>
 #include <lttvwindow/menu.h>
 
 
-inline LttvMenus *lttv_menus_new() {
+LttvMenus *lttv_menus_new() {
   return g_array_new(FALSE, FALSE, sizeof(LttvMenuClosure));
 }
 
 /* MD: delete elements of the array also, but don't free pointed addresses
  * (functions).
  */
-inline void lttv_menus_destroy(LttvMenus *h) {
+void lttv_menus_destroy(LttvMenus *h) {
   g_debug("lttv_menus_destroy()");
   g_array_free(h, TRUE);
 }
 
-inline void lttv_menus_add(LttvMenus *h, lttvwindow_viewer_constructor f, char* menuPath, char* menuText, GtkWidget *widget)
+LttvMenuClosure lttv_menus_add(LttvMenus *h,
+    lttvwindow_viewer_constructor f,
+    char* menu_path, char* menu_text, GtkWidget *widget)
 {
   LttvMenuClosure c;
 
-  /* if h is null, do nothing, or popup a warning message */
-  if(h == NULL)return;
-
   c.con = f;
-  c.menuPath = menuPath;
-  c.menuText = menuText;
+  c.menu_path = menu_path;
+  c.menu_text = menu_text;
   c.widget = widget;
-  g_array_append_val(h,c);
+  if(h != NULL) 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)
 {
   LttvMenuClosure * tmp;
-  gint i;
+  guint i;
+  GtkWidget *widget;
+  
   for(i=0;i<h->len;i++){
     tmp = & g_array_index(h, LttvMenuClosure, i);
-    if(tmp->con == f)break;
+    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;
   
 }