Fix deletion and selection of objects clicking on styledialog rows and vice-versa

(bzr r14949.1.39)

1 files changed, 7 insertions, 5 deletions

diff --git a/src/ui/dialog/styledialog.h b/src/ui/dialog/styledialog.h
index 6e1ffbb2c..e47fbc96d 100644
--- a/src/ui/dialog/styledialog.h
+++ b/src/ui/dialog/styledialog.h
@@ -30,6 +30,8 @@ namespace Dialog {
  * @brief The StyleDialog class
  * A list of CSS selectors will show up in this dialog.
  */
+typedef std::pair<std::pair<std::string, std::vector<SPObject *> >, std::string>
+_selectorVecType;
 
 class StyleDialog : public UI::Widget::Panel
 {
@@ -43,10 +45,10 @@ public:
 private:
     void _styleButton( Gtk::Button& btn, char const* iconName, char const* tooltip);
     std::string _setClassAttribute(std::vector<SPObject*>);
-    std::vector<std::pair<std::pair<std::string, SPObject *>, std::string> >_selectorVec;
-    std::vector<std::pair<std::pair<std::string, SPObject *>, std::string> > _getSelectorVec();
-    std::string _populateTree(std::vector<std::pair<std::pair<std::string, SPObject *>,
-                              std::string> >);
+
+    std::vector<_selectorVecType>_selectorVec;
+    std::vector<_selectorVecType> _getSelectorVec();
+    std::string _populateTree(std::vector<_selectorVecType>);
     bool _handleButtonEvent(GdkEventButton *event);
     void _selectedRowCallback(const Gtk::TreeModel::Path& path,
                                 Gtk::TreeViewColumn* /* column */);
@@ -62,7 +64,7 @@ private:
         { add(_selectorLabel); add(_colAddRemove); add(_colObj); }
         Gtk::TreeModelColumn<Glib::ustring> _selectorLabel;
         Gtk::TreeModelColumn<bool> _colAddRemove;
-        Gtk::TreeModelColumn<SPObject *> _colObj;
+        Gtk::TreeModelColumn<std::vector<SPObject *> > _colObj;
     };
 
     SPDesktop* _desktop;