From 95aad0dc155cde99a2f3d3518f486f49e76175dc Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 16 Dec 2021 23:42:33 +0100 Subject: [PATCH] Disambiguate Rect(angle) -- fixes Windows and macOS builds --- gtk2_ardour/cuebox_ui.cc | 16 ++++++++-------- gtk2_ardour/midi_clip_editor.cc | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/cuebox_ui.cc b/gtk2_ardour/cuebox_ui.cc index d853938f89..fba09b5be1 100644 --- a/gtk2_ardour/cuebox_ui.cc +++ b/gtk2_ardour/cuebox_ui.cc @@ -118,7 +118,7 @@ CueEntry::event_handler (GdkEvent* ev) void CueEntry::_size_allocate (ArdourCanvas::Rect const & alloc) { - Rectangle::_size_allocate (alloc); + ArdourCanvas::Rectangle::_size_allocate (alloc); const Distance width = _rect.width(); const Distance height = _rect.height(); @@ -134,7 +134,7 @@ CueEntry::_size_allocate (ArdourCanvas::Rect const & alloc) float tleft = height; //make room for the play button float twidth = name_button->width() - poly_margin*2; - name_text->size_allocate (Rect(0, 0, width, height)); + name_text->size_allocate (ArdourCanvas::Rect (0, 0, width, height)); name_text->set_position (Duple (tleft + poly_margin, poly_margin -0.5)); name_text->clamp_width ( width - height ); @@ -143,15 +143,15 @@ CueEntry::_size_allocate (ArdourCanvas::Rect const & alloc) } void -CueEntry::render (Rect const & area, Cairo::RefPtr context) const +CueEntry::render (ArdourCanvas::Rect const & area, Cairo::RefPtr context) const { - Rectangle::render(area, context); + ArdourCanvas::Rectangle::render(area, context); /* Note that item_to_window() already takes _position into account (as part of item_to_canvas() */ - Rect self (item_to_window (_rect)); - const Rect draw = self.intersection (area); + ArdourCanvas::Rect self (item_to_window (_rect)); + const ArdourCanvas::Rect draw = self.intersection (area); if (!draw) { return; @@ -251,7 +251,7 @@ Gtkmm2ext::Bindings* CueBoxUI::bindings = 0; Glib::RefPtr CueBoxUI::trigger_actions; CueBoxUI::CueBoxUI (ArdourCanvas::Item* parent) - : Rectangle (parent) + : ArdourCanvas::Rectangle (parent) { set_layout_sensitive(true); //why??? @@ -320,7 +320,7 @@ CueBoxUI::build () void CueBoxUI::_size_allocate (ArdourCanvas::Rect const & alloc) { - Rectangle::_size_allocate (alloc); + ArdourCanvas::Rectangle::_size_allocate (alloc); const float width = alloc.width(); const float height = alloc.height(); diff --git a/gtk2_ardour/midi_clip_editor.cc b/gtk2_ardour/midi_clip_editor.cc index 1734595f9f..0e87ceaa42 100644 --- a/gtk2_ardour/midi_clip_editor.cc +++ b/gtk2_ardour/midi_clip_editor.cc @@ -59,7 +59,7 @@ MidiClipEditor::MidiClipEditor () const double width = 600. * scale; const double height = 210. * scale; - frame = new Rectangle (this); + frame = new ArdourCanvas::Rectangle (this); ArdourCanvas::Rect r (0, 0, width, height); frame->set (r);