summaryrefslogtreecommitdiffstats
path: root/src/widgets/sp-color-notebook.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2013-04-29 00:51:29 +0000
committerJon A. Cruz <jon@joncruz.org>2013-04-29 00:51:29 +0000
commitc317c1f79519f0ee961842ffb9feac4494af5377 (patch)
tree28187bf8ccee447689430f1c0243700e0565e958 /src/widgets/sp-color-notebook.cpp
parentTemporily fix abiguous macros before later removal. (diff)
downloadinkscape-c317c1f79519f0ee961842ffb9feac4494af5377.tar.gz
inkscape-c317c1f79519f0ee961842ffb9feac4494af5377.zip
Fixed logic error confusing bitwise and with logical and.
Whitespace cleanup to make the issue easier to spot. (bzr r12311)
Diffstat (limited to 'src/widgets/sp-color-notebook.cpp')
-rw-r--r--src/widgets/sp-color-notebook.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 89c5ed76a..f75521e2c 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -129,7 +129,7 @@ void ColorNotebook::switchPage(GtkNotebook*,
csel->base->getColorAlpha(_color, _alpha);
}
widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (_book), page_num);
- if ( widget && SP_IS_COLOR_SELECTOR (widget) )
+ if ( widget && SP_IS_COLOR_SELECTOR(widget) )
{
csel = SP_COLOR_SELECTOR (widget);
csel->base->setColorAlpha( _color, _alpha );
@@ -232,7 +232,7 @@ void ColorNotebook::init()
{
guint howmany = 1;
gpointer klass = g_type_class_ref (selector_types[i]);
- if ( klass && SP_IS_COLOR_SELECTOR_CLASS (klass) )
+ if ( klass && SP_IS_COLOR_SELECTOR_CLASS(klass) )
{
SPColorSelectorClass *ck = SP_COLOR_SELECTOR_CLASS (klass);
howmany = MAX (1, ck->submode_count);