summaryrefslogtreecommitdiffstats
path: root/src/ui/clipboard.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2016-07-28 15:16:18 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2016-07-28 15:16:18 +0000
commitdcd91f59f597ab4af07cee5929ce0e2e1f9104d5 (patch)
tree2cf4e55d031d71cc18a213d76d15a4a5a8128fe5 /src/ui/clipboard.cpp
parentui/widgets: Drop GTK2 fallbacks (diff)
downloadinkscape-dcd91f59f597ab4af07cee5929ce0e2e1f9104d5.tar.gz
inkscape-dcd91f59f597ab4af07cee5929ce0e2e1f9104d5.zip
Drop remaining GTKMM 2 fallback support
(bzr r15023.2.7)
Diffstat (limited to 'src/ui/clipboard.cpp')
-rw-r--r--src/ui/clipboard.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index d581dbf7e..6b24c5a2d 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -1300,11 +1300,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
/*
@@ -1363,12 +1359,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) {