diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2017-12-25 17:27:14 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2017-12-25 17:27:14 +0000 |
| commit | 2a5ed8387709c5d2108dc8213b7a4e9bdfb90685 (patch) | |
| tree | 6769a68b657689aab092f15b60d4958dd31df258 /src | |
| parent | sp-marshal: fix deprecation (diff) | |
| download | inkscape-2a5ed8387709c5d2108dc8213b7a4e9bdfb90685.tar.gz inkscape-2a5ed8387709c5d2108dc8213b7a4e9bdfb90685.zip | |
Fix FTBFS with GtkMM < 3.14 (lp:1740024)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/symbols.cpp | 6 | ||||
| -rw-r--r-- | src/ui/dialog/symbols.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 60c9b2b32..1642ff04c 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -192,7 +192,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : scroller->add(*Gtk::manage(icon_view)); scroller->set_hexpand(); scroller->set_vexpand(); -#if GTK_CHECK_VERSION(3,2,4) +#if GTKMM_CHECK_VERSION(3,14,0) overlay = new Gtk::Overlay(); overlay->set_hexpand(); overlay->set_vexpand(); @@ -447,7 +447,7 @@ void SymbolsDialog::rebuild() { } } void SymbolsDialog::showOverlay() { -#if GTK_CHECK_VERSION(3,2,4) +#if GTKMM_CHECK_VERSION(3,14,0) Glib::ustring current = Glib::Markup::escape_text(symbol_set->get_active_text()); overlay_icon->set_from_icon_name("none", iconsize); if (current == ALLDOCS && !l.size()) @@ -495,7 +495,7 @@ void SymbolsDialog::showOverlay() { } void SymbolsDialog::hideOverlay() { -#if GTK_CHECK_VERSION(3,2,4) +#if GTKMM_CHECK_VERSION(3,14,0) overlay_opacity->hide(); overlay_icon->hide(); overlay_title->hide(); diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h index 6e49939af..fc5c861ed 100644 --- a/src/ui/dialog/symbols.h +++ b/src/ui/dialog/symbols.h @@ -132,7 +132,7 @@ private: Gtk::Button* more; Gtk::Button* fewer; Gtk::HBox* tools; -#if GTK_CHECK_VERSION(3,2,4) +#if GTKMM_CHECK_VERSION(3,14,0) Gtk::Overlay* overlay; #endif Gtk::Image* overlay_icon; |