X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_content_view.h;h=7087e9641b62cd7073792cfa97441ff89b0fabd8;hb=487cb0c6d7ebe705f015176b0d7e98e23c8c5d28;hp=fcc0680647734c7dc80ca906b42e2eb0ef324266;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h index fcc068064..7087e9641 100644 --- a/src/wx/timeline_content_view.h +++ b/src/wx/timeline_content_view.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,9 +18,12 @@ */ + #ifndef DCPOMATIC_TIMELINE_CONTENT_VIEW_H #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H + +#include "lib/change_signaller.h" #include "lib/types.h" #include "lib/warnings.h" #include "timeline_view.h" @@ -31,6 +34,7 @@ DCPOMATIC_ENABLE_WARNINGS class Content; + /** @class TimelineContentView * @brief Parent class for views of pieces of content. */ @@ -39,7 +43,7 @@ class TimelineContentView : public TimelineView public: TimelineContentView (Timeline& tl, std::shared_ptr c); - dcpomatic::Rect bbox () const; + dcpomatic::Rect bbox () const override; void set_selected (bool s); bool selected () const; @@ -59,16 +63,18 @@ protected: private: - void do_paint (wxGraphicsContext* gc, std::list > overlaps); + void do_paint (wxGraphicsContext* gc, std::list> overlaps) override; int y_pos (int t) const; void content_change (ChangeType type, int p); boost::optional _track; - bool _selected; + bool _selected = false; boost::signals2::scoped_connection _content_connection; }; -typedef std::vector > TimelineContentViewList; + +typedef std::vector> TimelineContentViewList; + #endif