X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_view.h;h=f3aa4d5e65ad9983e2490398318eff4762c085d4;hb=b5d3e588919ba89e4dca9cf302b3b29cda5f136c;hp=f0ded7bce1583c8478f3c663f95036448f0e1e29;hpb=c6871fe8617b3de03662b7630355059393bf8043;p=dcpomatic.git diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h index f0ded7bce..f3aa4d5e6 100644 --- a/src/wx/timeline_view.h +++ b/src/wx/timeline_view.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,34 +18,40 @@ */ + #ifndef DCPOMATIC_TIMELINE_VIEW_H #define DCPOMATIC_TIMELINE_VIEW_H + #include "lib/rect.h" #include "lib/dcpomatic_time.h" -#include + class wxGraphicsContext; class Timeline; + /** @class TimelineView * @brief Parent class for components of the timeline (e.g. a piece of content or an axis). */ -class TimelineView : public boost::noncopyable +class TimelineView { public: explicit TimelineView (Timeline& t); virtual ~TimelineView () {} - void paint (wxGraphicsContext* g, std::list > overlaps); + TimelineView (TimelineView const&) = delete; + TimelineView& operator= (TimelineView const&) = delete; + + void paint (wxGraphicsContext* g, std::list> overlaps); void force_redraw (); virtual dcpomatic::Rect bbox () const = 0; protected: - virtual void do_paint (wxGraphicsContext *, std::list > overlaps) = 0; + virtual void do_paint (wxGraphicsContext *, std::list> overlaps) = 0; - int time_x (DCPTime t) const; + int time_x (dcpomatic::DCPTime t) const; Timeline& _timeline; @@ -53,6 +59,8 @@ private: dcpomatic::Rect _last_paint_bbox; }; -typedef std::vector > TimelineViewList; + +typedef std::vector> TimelineViewList; + #endif