From f4403837dfff09b241c3765422c652f8a9d11991 Mon Sep 17 00:00:00 2001
From: Alexander Valavanis <valavanisalex@gmail.com>
Date: Mon, 27 May 2019 14:05:15 +0100
Subject: Strip out all content from TextToolbar

---
 share/ui/toolbar-select.ui      |  2 ++
 src/ui/toolbar/text-toolbar.cpp | 16 +++++++++-------
 src/ui/toolbar/text-toolbar.h   |  2 +-
 src/widgets/toolbox.cpp         |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/share/ui/toolbar-select.ui b/share/ui/toolbar-select.ui
index abb3e6080..b73d04a0e 100644
--- a/share/ui/toolbar-select.ui
+++ b/share/ui/toolbar-select.ui
@@ -1,4 +1,5 @@
 <ui>
+	<!--
   <toolbar name='TextToolbar'>
     <toolitem action='TextFontFamilyAction' />
     <toolitem action='TextFontStyleAction' />
@@ -25,4 +26,5 @@
     <toolitem action='TextOrientationAction' />
     <toolitem action='TextDirectionAction' />
   </toolbar>
+  -->
 </ui>
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index 3b55f8b08..3228fbc8a 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -270,17 +270,11 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
     _tracker->addUnit(unit_table.getUnit("em"));
     _tracker->addUnit(unit_table.getUnit("ex"));
     _tracker->setActiveUnit(unit_table.getUnit("%"));
-}
-
-// Define all the "widgets" in the toolbar.
-GtkWidget *
-TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
-{
-    auto toolbar = new TextToolbar(desktop);
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     GtkIconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1);
 
+#if 0
     /* Font family */
     {
         // Font list
@@ -838,6 +832,7 @@ TextToolbar::prep(SPDesktop *desktop, GtkActionGroup* mainActions)
     desktop->connectEventContextChanged(sigc::mem_fun(*toolbar, &TextToolbar::watch_ec));
 
     return GTK_WIDGET(toolbar->gobj());
+#endif
 }
 
 void
@@ -913,6 +908,13 @@ TextToolbar::fontfamily_value_changed( Ink_ComboBoxEntry_Action *act, gpointer d
 #endif
 }
 
+GtkWidget *
+TextToolbar::create(SPDesktop *desktop)
+{
+    auto tb = Gtk::manage(new TextToolbar(desktop));
+    return GTK_WIDGET(tb->gobj());
+}
+
 void
 TextToolbar::fontsize_value_changed( Ink_ComboBoxEntry_Action *act, gpointer data)
 {
diff --git a/src/ui/toolbar/text-toolbar.h b/src/ui/toolbar/text-toolbar.h
index acc6f3268..1b0133bb4 100644
--- a/src/ui/toolbar/text-toolbar.h
+++ b/src/ui/toolbar/text-toolbar.h
@@ -129,7 +129,7 @@ protected:
     TextToolbar(SPDesktop *desktop);
 
 public:
-    static GtkWidget * prep(SPDesktop *desktop, GtkActionGroup* mainActions);
+    static GtkWidget * create(SPDesktop *desktop);
 };
 
 }
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index b3f25c764..605ae8956 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -222,7 +222,7 @@ static struct {
     { "/tools/lpetool", "lpetool_toolbox", Inkscape::UI::Toolbar::LPEToolbar::create, nullptr, "LPEToolToolbar",
       SP_VERB_CONTEXT_LPETOOL_PREFS, "/tools/lpetool", _("TBD")},
     // If you change TextToolbar here, change it also in desktop-widget.cpp
-    { "/tools/text",   "text_toolbox",   nullptr, Inkscape::UI::Toolbar::TextToolbar::prep, "TextToolbar",
+    { "/tools/text",   "text_toolbox",  Inkscape::UI::Toolbar::TextToolbar::create, nullptr, "TextToolbar",
       SP_VERB_INVALID, nullptr, nullptr},
     { "/tools/dropper", "dropper_toolbox", Inkscape::UI::Toolbar::DropperToolbar::create, nullptr,         "DropperToolbar",
       SP_VERB_INVALID, nullptr, nullptr},
-- 
cgit v1.2.3