diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-11-25 20:44:01 +0200 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-29 07:25:58 -0400 |
| commit | d9cb8a807e9cd9e355e9445caad2f7f9adc0bfad (patch) | |
| tree | 68ff38c3e8d1fb9ec365177e71a1db521c298fdd /libs | |
| parent | 2673ef4af40b67b54a48a13db4b20f8da32dcebd (diff) | |
Fix method hiding in Canvas::Text
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/canvas/canvas/text.h | 6 | ||||
| -rw-r--r-- | libs/canvas/text.cc | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libs/canvas/canvas/text.h b/libs/canvas/canvas/text.h index f72c088566..a967206e65 100644 --- a/libs/canvas/canvas/text.h +++ b/libs/canvas/canvas/text.h @@ -65,9 +65,9 @@ private: mutable double _width_correction; double _clamped_width; - void redraw (Cairo::RefPtr<Cairo::Context>) const; - void redraw (Glib::RefPtr<Pango::Context>) const; - void _redraw (Glib::RefPtr<Pango::Layout>) const; + void _redraw (Cairo::RefPtr<Cairo::Context>) const; + void _redraw (Glib::RefPtr<Pango::Context>) const; + void __redraw (Glib::RefPtr<Pango::Layout>) const; }; } diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index 8744a7fd77..c1b1c517c8 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -77,7 +77,7 @@ Text::set (string const & text) } void -Text::redraw (Cairo::RefPtr<Cairo::Context> context) const +Text::_redraw (Cairo::RefPtr<Cairo::Context> context) const { if (_text.empty()) { return; @@ -85,22 +85,22 @@ Text::redraw (Cairo::RefPtr<Cairo::Context> context) const Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context); - _redraw (layout); + __redraw (layout); } void -Text::redraw (Glib::RefPtr<Pango::Context> context) const +Text::_redraw (Glib::RefPtr<Pango::Context> context) const { if (_text.empty()) { return; } Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context); - _redraw (layout); + __redraw (layout); } void -Text::_redraw (Glib::RefPtr<Pango::Layout> layout) const +Text::__redraw (Glib::RefPtr<Pango::Layout> layout) const { layout->set_text (_text); @@ -158,7 +158,7 @@ Text::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const } if (_need_redraw) { - redraw (context); + _redraw (context); } Rect intersection (i.get()); @@ -189,7 +189,7 @@ Text::compute_bounding_box () const if (_bounding_box_dirty) { if (_need_redraw || !_image) { Glib::RefPtr<Pango::Context> 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; |