diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2016-07-28 18:15:34 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2016-07-28 18:15:34 +0000 |
| commit | 49a7927ecf31ace696e9e5770e8d6543c356db7a (patch) | |
| tree | d5c2d0a3d1581718d0d4cf2b2e2bcddf24b0105f /src/ui/dialog | |
| parent | Drop remaining GTKMM 2 fallback support (diff) | |
| download | inkscape-49a7927ecf31ace696e9e5770e8d6543c356db7a.tar.gz inkscape-49a7927ecf31ace696e9e5770e8d6543c356db7a.zip | |
Finish removing GTK+ 2 fallbacks
(bzr r15023.2.8)
Diffstat (limited to 'src/ui/dialog')
| -rw-r--r-- | src/ui/dialog/export.cpp | 5 | ||||
| -rw-r--r-- | src/ui/dialog/font-substitution.cpp | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index 5e7c68985..5167ca2a2 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -67,12 +67,7 @@ #include "helper/png-write.h" -#if WITH_EXT_GDL #include <gdl/gdl-dock-item.h> -#else -#include "libgdl/gdl-dock-item.h" -#endif - // required to set status message after export #include "desktop.h" diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index f219f3db6..18a7241a4 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -106,11 +106,7 @@ FontSubstitution::show(Glib::ustring out, std::vector<SPItem*> &l) cbWarning->set_label(_("Don't show this warning again")); cbWarning->show(); -#if GTK_CHECK_VERSION(3,0,0) - Gtk::Box * box = warning.get_content_area(); -#else - Gtk::Box * box = warning.get_vbox(); -#endif + auto box = warning.get_content_area(); box->set_spacing(2); box->pack_start(*scrollwindow, true, true, 4); box->pack_start(*cbSelect, false, false, 0); |