make crunch build optional and disabled by default

[xonotic/netradiant.git] / libs / gtkutil / toolbar.h

diff --git a/libs/gtkutil/toolbar.h b/libs/gtkutil/toolbar.h
index 421e20a54c527b9446114f7c381d3fc300523910..b016ab222bf7cf3df8c2d454ead63300300761f1 100644 (file)
--- a/libs/gtkutil/toolbar.h
+++ b/libs/gtkutil/toolbar.h
@@ -22,19 +22,23 @@
 #if !defined( INCLUDED_GTKUTIL_TOOLBAR_H )
 #define INCLUDED_GTKUTIL_TOOLBAR_H
 
-#include <gtk/gtk.h>
 #include <uilib/uilib.h>
-#include "generic/callbackfwd.h"
+#include "generic/callback.h"
 
-typedef struct _GtkButton GtkButton;
-typedef struct _GtkToggleButton GtkToggleButton;
-typedef struct _GtkToolbar GtkToolbar;
 class Command;
+
 class Toggle;
 
-ui::ToolButton toolbar_append_button( GtkToolbar* toolbar, const char* description, const char* icon, const Callback& callback );
-ui::ToolButton toolbar_append_button( GtkToolbar* toolbar, const char* description, const char* icon, const Command& command );
-ui::ToggleToolButton toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const Callback& callback );
-ui::ToggleToolButton toolbar_append_toggle_button( GtkToolbar* toolbar, const char* description, const char* icon, const Toggle& toggle );
+ui::ToolButton
+toolbar_append_button(ui::Toolbar toolbar, const char *description, const char *icon, const Callback<void()> &callback);
+
+ui::ToolButton
+toolbar_append_button(ui::Toolbar toolbar, const char *description, const char *icon, const Command &command);
+
+ui::ToggleToolButton toolbar_append_toggle_button(ui::Toolbar toolbar, const char *description, const char *icon,
+                                                  const Callback<void()> &callback);
+
+ui::ToggleToolButton
+toolbar_append_toggle_button(ui::Toolbar toolbar, const char *description, const char *icon, const Toggle &toggle);
 
 #endif