From 2ca9be0db6ec5173e382e032f7e43768049352cb Mon Sep 17 00:00:00 2001
From: Alexander Valavanis <valavanisalex@gmail.com>
Date: Tue, 4 Jun 2019 16:55:52 +0100
Subject: ComboBoxToolItem: Rebase on ToolItem

---
 src/ui/toolbar/text-toolbar.cpp |  6 +++---
 src/ui/toolbar/text-toolbar.h   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index 929c709f7..e9ef3b2d6 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -753,7 +753,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
 }
 
 void
-TextToolbar::fontfamily_value_changed( UI::Widget::ComboBoxEntryAction *act, gpointer data )
+TextToolbar::fontfamily_value_changed( UI::Widget::ComboBoxEntryToolItem *act, gpointer data )
 {
     auto toolbar = reinterpret_cast<TextToolbar *>(data);
 
@@ -836,7 +836,7 @@ TextToolbar::create(SPDesktop *desktop)
 }
 
 void
-TextToolbar::fontsize_value_changed( UI::Widget::ComboBoxEntryAction *act, gpointer data)
+TextToolbar::fontsize_value_changed( UI::Widget::ComboBoxEntryToolItem *act, gpointer data)
 {
     auto toolbar = reinterpret_cast<TextToolbar *>(data);
 
@@ -925,7 +925,7 @@ TextToolbar::fontsize_value_changed( UI::Widget::ComboBoxEntryAction *act, gpoin
 }
 
 void
-TextToolbar::fontstyle_value_changed( UI::Widget::ComboBoxEntryAction *act, gpointer data)
+TextToolbar::fontstyle_value_changed( UI::Widget::ComboBoxEntryToolItem *act, gpointer data)
 {
     auto toolbar = reinterpret_cast<TextToolbar *>(data);
 
diff --git a/src/ui/toolbar/text-toolbar.h b/src/ui/toolbar/text-toolbar.h
index 0c47b33b5..493ed624b 100644
--- a/src/ui/toolbar/text-toolbar.h
+++ b/src/ui/toolbar/text-toolbar.h
@@ -48,7 +48,7 @@ class ToolBase;
 }
 
 namespace Widget {
-class ComboBoxEntryAction;
+class ComboBoxEntryToolItem;
 class ComboToolItem;
 class SpinButtonToolItem;
 class UnitTracker;
@@ -62,9 +62,9 @@ private:
 
     UI::Widget::UnitTracker *_tracker;
 
-    UI::Widget::ComboBoxEntryAction *_font_family_action;
-    UI::Widget::ComboBoxEntryAction *_font_size_action;
-    UI::Widget::ComboBoxEntryAction *_font_style_action;
+    UI::Widget::ComboBoxEntryToolItem *_font_family_action;
+    UI::Widget::ComboBoxEntryToolItem *_font_size_action;
+    UI::Widget::ComboBoxEntryToolItem *_font_style_action;
     Gtk::ToggleToolButton *_superscript_item;
     Gtk::ToggleToolButton *_subscript_item;
     Gtk::ToggleToolButton *_outer_style_item;
@@ -96,11 +96,11 @@ private:
     sigc::connection c_selection_modified;
     sigc::connection c_subselection_changed;
 
-    static void fontfamily_value_changed(UI::Widget::ComboBoxEntryAction *act,
+    static void fontfamily_value_changed(UI::Widget::ComboBoxEntryToolItem *act,
                                          gpointer                  data);
-    static void fontsize_value_changed  (UI::Widget::ComboBoxEntryAction *act,
+    static void fontsize_value_changed  (UI::Widget::ComboBoxEntryToolItem *act,
                                          gpointer                  data);
-    static void fontstyle_value_changed (UI::Widget::ComboBoxEntryAction *act,
+    static void fontstyle_value_changed (UI::Widget::ComboBoxEntryToolItem *act,
                                          gpointer                         data);
     void script_changed(Gtk::ToggleToolButton *btn);
     void lineheight_unset_changed();
-- 
cgit v1.2.3