diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 11:41:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 11:41:05 -0400 |
| commit | 6a5d805b383cd71bb1d0984964439c5ec08e9270 (patch) | |
| tree | d551b417d1dbc026376207a94b4933a0b824797b /gtk2_ardour/marker.h | |
| parent | f0933bf00551ce998ca441aa5611d27702f6e590 (diff) | |
more canvas refactoring.
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
Diffstat (limited to 'gtk2_ardour/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index facaaffb09..3a3339d318 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -56,7 +56,7 @@ class Marker : public sigc::trackable }; - Marker (PublicEditor& editor, ArdourCanvas::Layout &, guint32 rgba, const std::string& text, Type, + Marker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type, framepos_t frame = 0, bool handle_events = true); virtual ~Marker (); @@ -76,8 +76,8 @@ class Marker : public sigc::trackable framepos_t position() const { return frame_position; } - ArdourCanvas::Layout * get_parent() { return _parent; } - void reparent (ArdourCanvas::Layout & parent); + ArdourCanvas::Container * get_parent() { return _parent; } + void reparent (ArdourCanvas::Container & parent); void hide (); void show (); @@ -98,8 +98,8 @@ class Marker : public sigc::trackable Pango::FontDescription name_font; - ArdourCanvas::Layout* _parent; - ArdourCanvas::Layout *group; + ArdourCanvas::Container* _parent; + ArdourCanvas::Container *group; ArdourCanvas::Polygon *mark; ArdourCanvas::Text *_name_item; ArdourCanvas::Points *points; @@ -134,7 +134,7 @@ private: class TempoMarker : public Marker { public: - TempoMarker (PublicEditor& editor, ArdourCanvas::Layout &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&); + TempoMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&); ~TempoMarker (); ARDOUR::TempoSection& tempo() const { return _tempo; } @@ -146,7 +146,7 @@ class TempoMarker : public Marker class MeterMarker : public Marker { public: - MeterMarker (PublicEditor& editor, ArdourCanvas::Layout &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&); + MeterMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&); ~MeterMarker (); ARDOUR::MeterSection& meter() const { return _meter; } |