fix compile. rename Proj::FINITE and INFINITE to VP_* because of apparent name clash...

[inkscape.git] / src / widgets / icon.h

diff --git a/src/widgets/icon.h b/src/widgets/icon.h
index 2ed165f7eb463f3b0dd6faedbc1fcec4f65085b3..55112c0aeeadb7338b0d8d69c541441b69823d38 100644 (file)
--- a/src/widgets/icon.h
+++ b/src/widgets/icon.h
@@ -14,7 +14,7 @@
 
 #include <glib.h>
 
-
+#include "icon-size.h"
 
 #define SP_TYPE_ICON (sp_icon_get_type ())
 #define SP_ICON(o) (GTK_CHECK_CAST ((o), SP_TYPE_ICON, SPIcon))
@@ -25,7 +25,7 @@
 struct SPIcon {
     GtkWidget widget;
 
-    GtkIconSize lsize;
+    Inkscape::IconSize lsize;
     int psize;
     gchar *name;
 
@@ -39,13 +39,14 @@ struct SPIconClass {
 
 GType sp_icon_get_type (void);
 
-GtkWidget *sp_icon_new( GtkIconSize size, const gchar *name );
+GtkWidget *sp_icon_new( Inkscape::IconSize size, const gchar *name );
 
 #include <glibmm/ustring.h>
 #include <gtkmm/widget.h>
 
 // Might return a wrapped SPIcon, or Gtk::Image
-Gtk::Widget *sp_icon_get_icon( const Glib::ustring &oid, GtkIconSize size = GTK_ICON_SIZE_BUTTON );
+Gtk::Widget *sp_icon_get_icon( const Glib::ustring &oid, Inkscape::IconSize size = Inkscape::ICON_SIZE_BUTTON );
 
+void sp_icon_fetch_pixbuf( SPIcon *icon );
 
 #endif // SEEN_SP_ICON_H