Initial c++-ification of toolbox creation.

(bzr r8955)

1 files changed, 23 insertions, 15 deletions

diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index a07a8cb2a..b028dd0a9 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -21,30 +21,38 @@
 #include "forward.h"
 #include "icon-size.h"
 
-GtkWidget *sp_tool_toolbox_new ();
-GtkWidget *sp_aux_toolbox_new ();
-GtkWidget *sp_commands_toolbox_new ();
-GtkWidget *sp_snap_toolbox_new ();
+namespace Inkscape {
+namespace UI {
 
-void sp_toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop);
+class ToolboxFactory
+{
+public:
+    static void setToolboxDesktop(GtkWidget *toolbox, SPDesktop *desktop);
+    static void setOrientation(GtkWidget* toolbox, GtkOrientation orientation);
+    static void showAuxToolbox(GtkWidget* toolbox);
 
-void update_snap_toolbox(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox);
-void setup_snap_toolbox (GtkWidget *toolbox, SPDesktop *desktop);
+    static GtkWidget *createToolToolbox();
+    static GtkWidget *createAuxToolbox();
+    static GtkWidget *createCommandsToolbox();
+    static GtkWidget *createSnapToolbox();
 
-void show_aux_toolbox(GtkWidget *toolbox);
+    static void updateSnapToolbox(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox);
 
-GtkWidget *sp_toolbox_button_normal_new_from_verb(GtkWidget *t,
-                                                  Inkscape::IconSize size,
-                                                  Inkscape::Verb * verb,
-                                                  Inkscape::UI::View::View *view,
-                                                  GtkTooltips *tt);
+    static Inkscape::IconSize prefToSize(Glib::ustring const &path, int base = 0 );
+
+private:
+    ToolboxFactory();
+};
+
+} // namespace UI
+} // namespace Inkscape
 
-void aux_toolbox_space(GtkWidget *tb, gint space);
 
 // utility
+
+// TODO remove this:
 void sp_toolbox_add_label(GtkWidget *tbl, gchar const *title, bool wide = true);
 
-Inkscape::IconSize prefToSize(Glib::ustring const &path, int base = 0 );
 
 #endif /* !SEEN_TOOLBOX_H */