updated to trunk

(bzr r14862.2.2)

8 files changed, 21 insertions, 4 deletions

diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index ec2e69fb3..2e30a48b5 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -687,8 +687,8 @@ void ColorICCSelectorImpl::_profilesChanged(std::string const &name)
     gtk_combo_box_set_active(combo, 0);
 
     int index = 1;
-    std::set<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
-    for (std::set<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
+    std::vector<SPObject *> current = SP_ACTIVE_DOCUMENT->getResourceList("iccprofile");
+    for (std::vector<SPObject *>::const_iterator it = current.begin(); it != current.end(); ++it) {
         SPObject *obj = *it;
         Inkscape::ColorProfile *prof = reinterpret_cast<Inkscape::ColorProfile *>(obj);
 
diff --git a/src/ui/widget/color-preview.cpp b/src/ui/widget/color-preview.cpp
index 5bcd16528..62c7cca1d 100644
--- a/src/ui/widget/color-preview.cpp
+++ b/src/ui/widget/color-preview.cpp
@@ -23,6 +23,7 @@ ColorPreview::ColorPreview (guint32 rgba)
 {
     _rgba = rgba;
     set_has_window(false);
+    set_name("ColorPreview");
 }
 
 void
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index c5e14d4f0..fda647182 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -56,6 +56,7 @@ Dock::Dock(Gtk::Orientation orientation)
 #endif
       _scrolled_window (Gtk::manage(new Gtk::ScrolledWindow))
 {
+    _scrolled_window->set_name("Dock");
 #if WITH_GDL_3_6
     gtk_orientable_set_orientation(GTK_ORIENTABLE(_gdl_dock_bar),
                                    static_cast<GtkOrientation>(orientation));
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 2a1fa352b..1a9ce617f 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -45,6 +45,7 @@ public:
     AlternateIcons(Inkscape::IconSize size, gchar const *a, gchar const *b)
     : _a(NULL), _b(NULL)
     {
+        set_name("AlternateIcons");
         if (a) {
             _a = Gtk::manage(sp_icon_get_icon(a, size));
             _a->set_no_show_all(true);
@@ -94,6 +95,7 @@ private:
 LayerSelector::LayerSelector(SPDesktop *desktop)
 : _desktop(NULL), _layer(NULL)
 {
+    set_name("LayerSelector");
     AlternateIcons *label;
 
     label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_DECORATION,
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 8a1e98a63..ab13577d7 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -73,6 +73,10 @@ Panel::Panel(Glib::ustring const &label, gchar const *prefs_path,
     _action_area(0),
     _fillable(0)
 {
+    set_name( "InkscapePanel" );
+#if WITH_GTKMM_3_0
+    set_orientation( Gtk::ORIENTATION_VERTICAL );
+#endif
     _init();
 }
 
@@ -92,7 +96,6 @@ void Panel::_popper(GdkEventButton* event)
 
 void Panel::_init()
 {
-    Glib::ustring tmp("<");
     _anchor = SP_ANCHOR_CENTER;
 
     guint panel_size = 0, panel_mode = 0, panel_ratio = 100, panel_border = 0;
@@ -282,7 +285,10 @@ void Panel::_init()
     pack_start(_top_bar, false, false);
 
     Gtk::HBox* boxy = Gtk::manage(new Gtk::HBox());
-
+    boxy->set_name( "PanelBoxY" );
+    _contents.set_name( "PanelContents" );
+    _right_bar.set_name( "PanelRightBar" );
+    _top_bar.set_name( "PanelTopBar" );
     boxy->pack_start(_contents, true, true);
     boxy->pack_start(_right_bar, false, true);
 
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index a90060e17..7b2836fe8 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -64,7 +64,11 @@ namespace Widget {
  * @see UI::Dialog::DesktopTracker to handle desktop change, selection change and selected object modifications.
  * @see UI::Dialog::DialogManager manages the dialogs within inkscape.
  */
+#if WITH_GTKMM_3_0
+class Panel : public Gtk::Box {
+#else
 class Panel : public Gtk::VBox {
+#endif
 
 public:
     static void prep();
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 87cf0b8c4..f7fd63f51 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -155,6 +155,7 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
       _unit_mis(NULL),
       _sw_unit(NULL)
 {
+    set_name("SelectedStyle");
     _drop[0] = _drop[1] = 0;
     _dropEnabled[0] = _dropEnabled[1] = false;
 
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index fa8543c46..188be705d 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -124,6 +124,8 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
 #endif
       _sw_unit(NULL)
 {
+    set_name("StyleSwatch");
+    
     _label[SS_FILL].set_markup(_("Fill:"));
     _label[SS_STROKE].set_markup(_("Stroke:"));