? go
? inkscape
Index: src/widgets/icon.h
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/widgets/icon.h,v
retrieving revision 1.11
diff -u -p -c -5 -u -p -r1.11 icon.h
--- src/widgets/icon.h	14 Jan 2005 16:46:19 -0000	1.11
+++ src/widgets/icon.h	7 Feb 2005 08:48:22 -0000
@@ -77,10 +77,14 @@ public :
 
   const Glib::RefPtr<Gdk::Pixbuf> getIcon(const Glib::ustring &oid) {
     ID id (oid, SP_ICON_SIZE_NOTEBOOK, SP_ICON_SIZE_NOTEBOOK);
     return getIcon(id);
   }
+  const Glib::RefPtr<Gdk::Pixbuf> getIcon(const Glib::ustring &oid, unsigned int size) {
+    ID id (oid, size, size);
+    return getIcon(id);
+  }
   const Glib::RefPtr<Gdk::Pixbuf> getIcon(const ID &id);
 
 private :
   PixBufFactory ();
   struct cmpID
Index: src/widgets/layer-selector.cpp
===================================================================
RCS file: /cvsroot/inkscape/inkscape/src/widgets/layer-selector.cpp,v
retrieving revision 1.29
diff -u -p -c -5 -u -p -r1.29 layer-selector.cpp
--- src/widgets/layer-selector.cpp	24 Jan 2005 04:52:49 -0000	1.29
+++ src/widgets/layer-selector.cpp	7 Feb 2005 08:48:22 -0000
@@ -14,10 +14,11 @@
 
 #include <cstring>
 #include <algorithm>
 #include <functional>
 #include <gtkmm/liststore.h>
+#include <gtkmm/image.h>
 
 #include "desktop-handles.h"
 #include "selection.h"
 
 #include "widgets/layer-selector.h"
@@ -46,16 +47,16 @@ class AlternateIcons : public Gtk::HBox 
 public:
     AlternateIcons(unsigned size, gchar const *a, gchar const *b)
     : _a(NULL), _b(NULL)
     {
         if (a) {
-            _a = Gtk::manage(Glib::wrap(sp_icon_new(size, a)));
+            _a = Gtk::manage(new Gtk::Image(PixBufFactory::get().getIcon(a,size)));
             _a->set_no_show_all(true);
             add(*_a);
         }
         if (b) {
-            _b = Gtk::manage(Glib::wrap(sp_icon_new(size, b)));
+            _b = Gtk::manage(new Gtk::Image(PixBufFactory::get().getIcon(b,size)));
             _b->set_no_show_all(true);
             add(*_b);
         }
         setState(false);
     }