diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-12-26 18:38:53 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@googlemail.com> | 2012-12-26 18:38:53 +0000 |
| commit | 6d2a2b893f0038412659b61fc5d4a5af491be6fa (patch) | |
| tree | 82db7abb7f559e5b05266de9b2b89fd77b93ab45 /src/widgets | |
| parent | Change tooltip to clarify behavior after commit r10784. (diff) | |
| download | inkscape-6d2a2b893f0038412659b61fc5d4a5af491be6fa.tar.gz inkscape-6d2a2b893f0038412659b61fc5d4a5af491be6fa.zip | |
Revert C++ casting for setting HSL map in sp-color-scales
(bzr r11991)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/ruler.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/sp-color-scales.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 31ef28c61..733de2239 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -13,8 +13,7 @@ * - We use a default font size of PANGO_SCALE_X_SMALL for labels, * GIMP uses PANGO_SCALE_SMALL (i.e., a bit larger than ours). * - * - In GIMP, the ruler position follows "track widgets" by connecting - * to their GtkWidget:motion-notify-event. + * - We abbreviate large numbers in tick-labels (e.g., 10000 -> 10k) * * Authors: * Lauris Kaplinski <lauris@kaplinski.com> diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp index 8fc3a9e44..c3f9d511c 100644 --- a/src/widgets/sp-color-scales.cpp +++ b/src/widgets/sp-color-scales.cpp @@ -463,7 +463,7 @@ void ColorScales::setMode(SPColorScalesMode mode) gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:")); gtk_widget_set_tooltip_text (_s[3], _("Alpha (opacity)")); gtk_widget_set_tooltip_text (_b[3], _("Alpha (opacity)")); - sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), reinterpret_cast<guchar*>(g_strdup(sp_color_scales_hue_map()))); + sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), (guchar *)(sp_color_scales_hue_map())); gtk_widget_hide (_l[4]); gtk_widget_hide (_s[4]); gtk_widget_hide (_b[4]); |