projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up careful_string_filter and add some extra transliterations.
[dcpomatic.git]
/
src
/
wx
/
timeline_view.h
diff --git
a/src/wx/timeline_view.h
b/src/wx/timeline_view.h
index f0ded7bce1583c8478f3c663f95036448f0e1e29..f3aa4d5e65ad9983e2490398318eff4762c085d4 100644
(file)
--- a/
src/wx/timeline_view.h
+++ b/
src/wx/timeline_view.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,34
+18,40
@@
*/
*/
+
#ifndef DCPOMATIC_TIMELINE_VIEW_H
#define DCPOMATIC_TIMELINE_VIEW_H
#ifndef DCPOMATIC_TIMELINE_VIEW_H
#define DCPOMATIC_TIMELINE_VIEW_H
+
#include "lib/rect.h"
#include "lib/dcpomatic_time.h"
#include "lib/rect.h"
#include "lib/dcpomatic_time.h"
-#include <boost/noncopyable.hpp>
+
class wxGraphicsContext;
class Timeline;
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
* @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 () {}
{
public:
explicit TimelineView (Timeline& t);
virtual ~TimelineView () {}
- void paint (wxGraphicsContext* g, std::list<dcpomatic::Rect<int> > overlaps);
+ TimelineView (TimelineView const&) = delete;
+ TimelineView& operator= (TimelineView const&) = delete;
+
+ void paint (wxGraphicsContext* g, std::list<dcpomatic::Rect<int>> overlaps);
void force_redraw ();
virtual dcpomatic::Rect<int> bbox () const = 0;
protected:
void force_redraw ();
virtual dcpomatic::Rect<int> bbox () const = 0;
protected:
- virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int>
> overlaps) = 0;
+ virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int>> overlaps) = 0;
- int time_x (DCPTime t) const;
+ int time_x (
dcpomatic::
DCPTime t) const;
Timeline& _timeline;
Timeline& _timeline;
@@
-53,6
+59,8
@@
private:
dcpomatic::Rect<int> _last_paint_bbox;
};
dcpomatic::Rect<int> _last_paint_bbox;
};
-typedef std::vector<boost::shared_ptr<TimelineView> > TimelineViewList;
+
+typedef std::vector<std::shared_ptr<TimelineView>> TimelineViewList;
+
#endif
#endif