diff --git a/libs/canvas/canvas/text.h b/libs/canvas/canvas/text.h index 2fffdc519b..2a0ad4b820 100644 --- a/libs/canvas/canvas/text.h +++ b/libs/canvas/canvas/text.h @@ -66,9 +66,9 @@ private: mutable double _width_correction; double _clamped_width; - void redraw (Cairo::RefPtr) const; - void redraw (Glib::RefPtr) const; - void _redraw (Glib::RefPtr) const; + void _redraw (Cairo::RefPtr) const; + void _redraw (Glib::RefPtr) const; + void __redraw (Glib::RefPtr) const; }; } diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index 549c1b4972..bd3a469242 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -80,7 +80,7 @@ Text::set (string const & text) } void -Text::redraw (Cairo::RefPtr context) const +Text::_redraw (Cairo::RefPtr context) const { if (_text.empty()) { return; @@ -88,22 +88,22 @@ Text::redraw (Cairo::RefPtr context) const Glib::RefPtr layout = Pango::Layout::create (context); - _redraw (layout); + __redraw (layout); } void -Text::redraw (Glib::RefPtr context) const +Text::_redraw (Glib::RefPtr context) const { if (_text.empty()) { return; } Glib::RefPtr layout = Pango::Layout::create (context); - _redraw (layout); + __redraw (layout); } void -Text::_redraw (Glib::RefPtr layout) const +Text::__redraw (Glib::RefPtr layout) const { #ifdef __APPLE__ if (_width_correction < 0.0) { @@ -184,7 +184,7 @@ Text::render (Rect const & area, Cairo::RefPtr context) const } if (_need_redraw) { - redraw (context); + _redraw (context); } Rect intersection (i.get()); @@ -215,7 +215,7 @@ Text::compute_bounding_box () const if (_bounding_box_dirty) { if (_need_redraw || !_image) { Glib::RefPtr context = Glib::wrap (gdk_pango_context_get()); // context now owns C object and will free it - redraw (context); + _redraw (context); } _bounding_box = Rect (0, 0, min (_clamped_width, (double) _image->get_width()), _image->get_height()); _bounding_box_dirty = false;