diff options
| -rw-r--r-- | gtk/.cvsignore | 1 | ||||
| -rw-r--r-- | gtk/gtkcolorsel.c | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/gtk/.cvsignore b/gtk/.cvsignore index 2c9959501..d02010b69 100644 --- a/gtk/.cvsignore +++ b/gtk/.cvsignore @@ -20,3 +20,4 @@ gtkmarshal.c gtktypebuiltins_ids.c gtktypebuiltins_vars.c gtktypebuiltins_evals.c +gtk.defs diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index fff42c7cb..b07d953ae 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1293,13 +1293,11 @@ gtk_color_selection_eval_wheel (gint x, gint y, gdouble cx, gdouble cy, gdouble *h, gdouble *s) { - gdouble d, r, rx, ry, l; + gdouble r, rx, ry; rx = ((gdouble) x - cx); ry = ((gdouble) y - cy); - d = (SQR (cy) * SQR (rx) + SQR (cx) * SQR (ry) - SQR (cx) * SQR (cy)); - rx = rx/cx; ry = ry/cy; @@ -1316,11 +1314,11 @@ gtk_color_selection_eval_wheel (gint x, gint y, if (*s == 0.0) *s = 0.00001; else if (*s > 1.0) - { - *s = 1.0; - return 1; - } - return 0; + { + *s = 1.0; + return TRUE; + } + return FALSE; } static void |