projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7eb5767
)
Comment.
author
Carl Hetherington
<cth@carlh.net>
Thu, 10 Oct 2013 14:22:42 +0000
(15:22 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 10 Oct 2013 14:22:42 +0000
(15:22 +0100)
src/wx/timeline.cc
patch
|
blob
|
history
diff --git
a/src/wx/timeline.cc
b/src/wx/timeline.cc
index def52ad9d5d78779641bcf7e958d4222da0135e4..e04d9ee744e94f83f4cf5354cfc6e150f65d5910 100644
(file)
--- a/
src/wx/timeline.cc
+++ b/
src/wx/timeline.cc
@@
-75,6
+75,8
@@
private:
dcpomatic::Rect<int> _last_paint_bbox;
};
+
+/** Parent class for views of pieces of content */
class ContentView : public View
{
public:
@@
-323,6
+325,7
@@
private:
int _y;
};
+
Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
, _film_editor (ed)