diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2016-08-04 11:26:03 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2016-08-04 11:26:03 +0000 |
| commit | 16fbf83a79ecd1882817598b74a14c07115a5a2c (patch) | |
| tree | 9b33850b019c65f9780d9d7cc09df65b9ad6836b /src/ui/clipboard.cpp | |
| parent | Fix Win32 build (diff) | |
| parent | ruler: Backport upstream patches (diff) | |
| download | inkscape-16fbf83a79ecd1882817598b74a14c07115a5a2c.tar.gz inkscape-16fbf83a79ecd1882817598b74a14c07115a5a2c.zip | |
End GTK+ 2 support and remove GDL fork
(bzr r15038)
Diffstat (limited to 'src/ui/clipboard.cpp')
| -rw-r--r-- | src/ui/clipboard.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 09ba9a1a9..14e9fdf32 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -1288,11 +1288,7 @@ Geom::Scale ClipboardManagerImpl::_getScale(SPDesktop *desktop, Geom::Point cons */ Glib::ustring ClipboardManagerImpl::_getBestTarget() { -#if WITH_GTKMM_3_0 - std::vector<Glib::ustring> targets = _clipboard->wait_for_targets(); -#else - std::list<Glib::ustring> targets = _clipboard->wait_for_targets(); -#endif + auto targets = _clipboard->wait_for_targets(); // clipboard target debugging snippet /* @@ -1351,12 +1347,7 @@ void ClipboardManagerImpl::_setClipboardTargets() { Inkscape::Extension::DB::OutputList outlist; Inkscape::Extension::db.get_output_list(outlist); - -#if WITH_GTKMM_3_0 std::vector<Gtk::TargetEntry> target_list; -#else - std::list<Gtk::TargetEntry> target_list; -#endif bool plaintextSet = false; for (Inkscape::Extension::DB::OutputList::const_iterator out = outlist.begin() ; out != outlist.end() ; ++out) { |