diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-04-09 05:49:41 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-04-09 05:49:41 +0000 |
| commit | 427dff020d70f1397502bdf45476cb917c00a1fc (patch) | |
| tree | 006985cb196f1b9017dbabe54f60e1cd0d86e626 /src/dialogs | |
| parent | Before the rev 10880 fix in xml/simple-node.cpp, text updating when dragging ... (diff) | |
| download | inkscape-427dff020d70f1397502bdf45476cb917c00a1fc.tar.gz inkscape-427dff020d70f1397502bdf45476cb917c00a1fc.zip | |
Adding in new icon size
(bzr r462)
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/swatches.cpp | 4 | ||||
| -rw-r--r-- | src/dialogs/swatches.h | 2 |
2 files changed, 3 insertions, 3 deletions
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; |