projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ConfigRestorer and use it instead of setup_test_config() directly.
[dcpomatic.git]
/
src
/
wx
/
timeline_labels_view.h
diff --git
a/src/wx/timeline_labels_view.h
b/src/wx/timeline_labels_view.h
index 88094f2c4068cd64cc4110eb165dc80d24a582ac..fb80b1bf3311ec9533fdd6e280620750516c188d 100644
(file)
--- a/
src/wx/timeline_labels_view.h
+++ b/
src/wx/timeline_labels_view.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016-20
18
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,16
+18,19
@@
*/
*/
+
#include "timeline_view.h"
#include "timeline_view.h"
+
class wxWindow;
class wxWindow;
+
class TimelineLabelsView : public TimelineView
{
public:
explicit TimelineLabelsView (Timeline& tl);
class TimelineLabelsView : public TimelineView
{
public:
explicit TimelineLabelsView (Timeline& tl);
- dcpomatic::Rect<int> bbox () const;
+ dcpomatic::Rect<int> bbox () const
override
;
void set_video_tracks (int n);
void set_audio_tracks (int n);
void set_video_tracks (int n);
void set_audio_tracks (int n);
@@
-35,7
+38,7
@@
public:
void set_atmos (bool s);
private:
void set_atmos (bool s);
private:
- void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>
> overlaps)
;
+ void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>
> overlaps) override
;
int _width = 0;
int _video_tracks = 0;
int _width = 0;
int _video_tracks = 0;