diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2019-06-04 15:55:52 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2019-06-04 15:55:52 +0000 |
| commit | 2ca9be0db6ec5173e382e032f7e43768049352cb (patch) | |
| tree | 1f883538b514bfda2fc37876b90e2343ac7724f7 /src/ui | |
| parent | Hackfest 2019: C++ify ComboBoxEntryAction (diff) | |
| download | inkscape-2ca9be0db6ec5173e382e032f7e43768049352cb.tar.gz inkscape-2ca9be0db6ec5173e382e032f7e43768049352cb.zip | |
ComboBoxToolItem: Rebase on ToolItem
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/toolbar/text-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/ui/toolbar/text-toolbar.h | 14 |
2 files changed, 10 insertions, 10 deletions
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(); |