Merge changes from trunk

(bzr r14949.1.64)

1 files changed, 14 insertions, 46 deletions

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index f269d1cb9..ed9ec3b0a 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -58,11 +58,7 @@ namespace Dialog {
 Action::Action(const Glib::ustring &id,
        const Glib::ustring &tiptext,
        guint row, guint column,
-#if WITH_GTKMM_3_0
-   Gtk::Grid &parent,
-#else
-   Gtk::Table &parent,
-#endif
+       Gtk::Grid &parent,
        AlignAndDistribute &dialog):
     _dialog(dialog),
     _id(id),
@@ -78,11 +74,7 @@ Action::Action(const Glib::ustring &id,
     pButton->signal_clicked()
         .connect(sigc::mem_fun(*this, &Action::on_button_click));
     pButton->set_tooltip_text(tiptext);
-#if WITH_GTKMM_3_0
     parent.attach(*pButton, column, row, 1, 1);
-#else
-    parent.attach(*pButton, column, column+1, row, row+1, Gtk::FILL, Gtk::FILL);
-#endif
 }
 
 
@@ -130,7 +122,7 @@ void ActionAlign::do_action(SPDesktop *desktop, int index)
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     bool sel_as_group = prefs->getBool("/dialogs/align/sel-as-groups");
 
-    std::vector<SPItem*> selected(selection->itemList());
+    std::vector<SPItem*> selected(selection->items().begin(), selection->items().end());
     if (selected.empty()) return;
 
     const Coeffs &a = _allCoeffs[index];
@@ -290,7 +282,7 @@ private :
         Inkscape::Selection *selection = desktop->getSelection();
         if (!selection) return;
 
-        std::vector<SPItem*> selected(selection->itemList());
+        std::vector<SPItem*> selected(selection->items().begin(), selection->items().end());
         if (selected.empty()) return;
 
         //Check 2 or more selected objects
@@ -444,11 +436,7 @@ public:
         Action(id, tiptext, row, column + 4,
                dialog.removeOverlap_table(), dialog)
     {
-#if WITH_GTKMM_3_0
         dialog.removeOverlap_table().set_column_spacing(3);
-#else
-        dialog.removeOverlap_table().set_col_spacings(3);
-#endif
 
         removeOverlapXGap.set_digits(1);
         removeOverlapXGap.set_size_request(60, -1);
@@ -470,17 +458,10 @@ public:
         removeOverlapYGapLabel.set_text_with_mnemonic(C_("Gap", "_V:"));
         removeOverlapYGapLabel.set_mnemonic_widget(removeOverlapYGap);
 
-#if WITH_GTKMM_3_0
         dialog.removeOverlap_table().attach(removeOverlapXGapLabel, column, row, 1, 1);
         dialog.removeOverlap_table().attach(removeOverlapXGap, column+1, row, 1, 1);
         dialog.removeOverlap_table().attach(removeOverlapYGapLabel, column+2, row, 1, 1);
         dialog.removeOverlap_table().attach(removeOverlapYGap, column+3, row, 1, 1);
-#else
-        dialog.removeOverlap_table().attach(removeOverlapXGapLabel, column, column+1, row, row+1, Gtk::FILL, Gtk::FILL);
-        dialog.removeOverlap_table().attach(removeOverlapXGap, column+1, column+2, row, row+1, Gtk::FILL, Gtk::FILL);
-        dialog.removeOverlap_table().attach(removeOverlapYGapLabel, column+2, column+3, row, row+1, Gtk::FILL, Gtk::FILL);
-        dialog.removeOverlap_table().attach(removeOverlapYGap, column+3, column+4, row, row+1, Gtk::FILL, Gtk::FILL);
-#endif
     }
 
 private :
@@ -496,7 +477,9 @@ private :
         // xGap and yGap are the minimum space required between bounding rectangles.
         double const xGap = removeOverlapXGap.get_value();
         double const yGap = removeOverlapYGap.get_value();
-        removeoverlap(_dialog.getDesktop()->getSelection()->itemList(), xGap, yGap);
+        auto tmp = _dialog.getDesktop()->getSelection()->items();
+        std::vector<SPItem *> vec(tmp.begin(), tmp.end());
+        removeoverlap(vec, xGap, yGap);
 
         // restore compensation setting
         prefs->setInt("/options/clonecompensation/value", saved_compensation);
@@ -527,8 +510,9 @@ private :
         int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
         prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
 
-        graphlayout(_dialog.getDesktop()->getSelection()->itemList());
-
+        auto tmp = _dialog.getDesktop()->getSelection()->items();
+        std::vector<SPItem *> vec(tmp.begin(), tmp.end());
+        graphlayout(vec);
         // restore compensation setting
         prefs->setInt("/options/clonecompensation/value", saved_compensation);
 
@@ -587,7 +571,7 @@ private :
         Inkscape::Selection *selection = desktop->getSelection();
         if (!selection) return;
 
-        std::vector<SPItem*> selected(selection->itemList());
+        std::vector<SPItem*> selected(selection->items().begin(), selection->items().end());
         if (selected.empty()) return;
 
         //Check 2 or more selected objects
@@ -653,7 +637,8 @@ private :
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
         prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
-        std::vector<SPItem*> x(_dialog.getDesktop()->getSelection()->itemList());
+        auto tmp = _dialog.getDesktop()->getSelection()->items();
+        std::vector<SPItem*> x(tmp.begin(), tmp.end());
         unclump (x);
 
         // restore compensation setting
@@ -684,7 +669,7 @@ private :
         Inkscape::Selection *selection = desktop->getSelection();
         if (!selection) return;
 
-        std::vector<SPItem*> selected(selection->itemList());
+        std::vector<SPItem*> selected(selection->items().begin(), selection->items().end());
         if (selected.empty()) return;
 
         //Check 2 or more selected objects
@@ -759,11 +744,7 @@ public :
                guint row,
                guint column,
                AlignAndDistribute &dialog,
-#if WITH_GTKMM_3_0
                Gtk::Grid &table,
-#else
-               Gtk::Table &table,
-#endif
                Geom::Dim2 orientation, bool distribute):
         Action(id, tiptext, row, column,
                table, dialog),
@@ -782,7 +763,7 @@ private :
         Inkscape::Selection *selection = desktop->getSelection();
         if (!selection) return;
 
-        std::vector<SPItem*> selected(selection->itemList());
+        std::vector<SPItem*> selected(selection->items().begin(), selection->items().end());
 
         //Check 2 or more selected objects
         if (selected.size() < 2) return;
@@ -936,19 +917,11 @@ AlignAndDistribute::AlignAndDistribute()
       _rearrangeFrame(_("Rearrange")),
       _removeOverlapFrame(_("Remove overlaps")),
       _nodesFrame(_("Nodes")),
-#if WITH_GTKMM_3_0
       _alignTable(),
       _distributeTable(),
       _rearrangeTable(),
       _removeOverlapTable(),
       _nodesTable(),
-#else
-      _alignTable(2, 6, true),
-      _distributeTable(2, 6, true),
-      _rearrangeTable(1, 5, false),
-      _removeOverlapTable(1, 5, false),
-      _nodesTable(1, 4, true),
-#endif
       _anchorLabel(_("Relative to: ")),
       _anchorLabelNode(_("Relative to: ")),
       _selgrpLabel(_("_Treat selection as group: "), 1)
@@ -1313,13 +1286,8 @@ void AlignAndDistribute::addRandomizeButton(const Glib::ustring &id, const Glib:
         );
 }
 
-#if WITH_GTKMM_3_0
 void AlignAndDistribute::addBaselineButton(const Glib::ustring &id, const Glib::ustring tiptext,
                                     guint row, guint col, Gtk::Grid &table, Geom::Dim2 orientation, bool distribute)
-#else
-void AlignAndDistribute::addBaselineButton(const Glib::ustring &id, const Glib::ustring tiptext,
-                                    guint row, guint col, Gtk::Table &table, Geom::Dim2 orientation, bool distribute)
-#endif
 {
     _actionList.push_back(
         new ActionBaseline(