make inline correct

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

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c
index 8a39ae74fb67ee97c2b3a4164404318c14c4ec78..8a7eb4a227e228d3cca56c2ef5b635ed384ea068 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c
@@ -19,22 +19,23 @@
 #include <lttv/lttv.h>
 #include <lttvwindow/toolbar.h>
 
-
-inline LttvToolbars *lttv_toolbars_new() {
-  return g_array_new(FALSE, FALSE, sizeof(lttv_toolbar_closure));
+LttvToolbars *lttv_toolbars_new() {
+  return g_array_new(FALSE, FALSE, sizeof(LttvToolbarClosure));
 }
 
 /* MD: delete elements of the array also, but don't free pointed addresses
  * (functions).
  */
-inline void lttv_toolbars_destroy(LttvToolbars *h) {
+void lttv_toolbars_destroy(LttvToolbars *h) {
   g_debug("lttv_toolbars_destroy");
   g_array_free(h, TRUE);
 }
 
-inline void lttv_toolbars_add(LttvToolbars *h, lttvwindow_viewer_constructor f, char* tooltip, char ** pixmap)
+LttvToolbarClosure lttv_toolbars_add(LttvToolbars *h,
+    lttvwindow_viewer_constructor f,
+    char* tooltip, char ** pixmap, GtkWidget *widget)
 {
-  lttv_toolbar_closure c;
+  LttvToolbarClosure c;
 
   /* if h is null, do nothing, or popup a warning message */
   if(h == NULL)return;
@@ -42,21 +43,29 @@ inline void lttv_toolbars_add(LttvToolbars *h, lttvwindow_viewer_constructor f,
   c.con = f;
   c.tooltip = tooltip;
   c.pixmap = pixmap;
+  c.widget = widget;
   g_array_append_val(h,c);
+
+  return c;
 }
 
-gboolean lttv_toolbars_remove(LttvToolbars *h, lttvwindow_viewer_constructor f)
+GtkWidget *lttv_toolbars_remove(LttvToolbars *h, lttvwindow_viewer_constructor f)
 {
-  lttv_toolbar_closure * tmp;
+  LttvToolbarClosure * tmp;
   gint i;
+  GtkWidget *widget;
+
   for(i=0;i<h->len;i++){
-    tmp = & g_array_index(h, lttv_toolbar_closure, i);
-    if(tmp->con == f)break;
+    tmp = & g_array_index(h, LttvToolbarClosure, 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;
 }
 
 unsigned lttv_toolbars_number(LttvToolbars *h)