X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Ftoolbar.h;h=2fb4b395a515f3ac764d5cd3a737cf30914dbe29;hb=bcacff8e2fc03007501455792b55b793996d336a;hp=681311b66a386cac9298e482b1b4b0ae588d45ec;hpb=754351700b3d5fb6112e72dd4722a546abc219f1;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.h
index 681311b6..2fb4b395 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.h
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.h
@@ -19,27 +19,29 @@
 #ifndef TOOLBAR_H
 #define TOOLBAR_H
 
-#include <lttvwindow/common.h>
-
-/* constructor of the viewer */
-//typedef GtkWidget* (*lttv_constructor)(void * main_window);
-
+#include <lttvwindow/lttvwindow.h>
+#include <gtk/gtk.h>
 
 typedef GArray LttvToolbars;
 
-typedef struct _lttv_toolbar_closure {
-  lttv_constructor con;
+typedef struct _LttvToolbarClosure {
+  lttvwindow_viewer_constructor con;
   char * tooltip;
   char ** pixmap;
-} lttv_toolbar_closure;
+  GtkWidget *widget;
+} LttvToolbarClosure;
 
 LttvToolbars *lttv_toolbars_new();
 
 void lttv_toolbars_destroy(LttvToolbars *h);
 
-void lttv_toolbars_add(LttvToolbars *h, lttv_constructor f, char* tooltip, char ** pixmap);
+LttvToolbarClosure lttv_toolbars_add(LttvToolbars *h,
+                       lttvwindow_viewer_constructor f,
+                       char* tooltip,
+                       char ** pixmap,
+                       GtkWidget *widget);
 
-gboolean lttv_toolbars_remove(LttvToolbars *h, lttv_constructor f);
+GtkWidget *lttv_toolbars_remove(LttvToolbars *h, lttvwindow_viewer_constructor f);
 
 unsigned lttv_toolbars_number(LttvToolbars *h);