From 427dff020d70f1397502bdf45476cb917c00a1fc Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sun, 9 Apr 2006 05:49:41 +0000
Subject: Adding in new icon size

(bzr r462)
---
 src/dialogs/swatches.cpp | 4 ++--
 src/dialogs/swatches.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/dialogs')

diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp
index a4b9a0d7d..bd2ec169c 100644
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
@@ -426,7 +426,7 @@ void ColorItem::_colorDefChanged(void* data)
 }
 
 
-Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Gtk::BuiltinIconSize size)
+Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Inkscape::IconSize size)
 {
     Gtk::Widget* widget = 0;
     if ( style == PREVIEW_STYLE_BLURB ) {
@@ -435,7 +435,7 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Gtk::Built
         widget = lbl;
     } else {
         Glib::ustring blank("          ");
-        if ( size == Gtk::ICON_SIZE_MENU ) {
+        if ( size == Inkscape::ICON_SIZE_MENU || size == Inkscape::ICON_SIZE_DECORATION ) {
             blank = " ";
         }
 
diff --git a/src/dialogs/swatches.h b/src/dialogs/swatches.h
index 965c32240..7e1357c48 100644
--- a/src/dialogs/swatches.h
+++ b/src/dialogs/swatches.h
@@ -43,7 +43,7 @@ public:
     virtual ColorItem &operator=(ColorItem const &other);
     virtual Gtk::Widget* getPreview(PreviewStyle style,
                                     ViewType view,
-                                    Gtk::BuiltinIconSize size);
+                                    Inkscape::IconSize size);
     void buttonClicked(bool secondary = false);
 
     ColorDef def;
-- 
cgit v1.2.3