projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try another way on OS X.
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.cc
diff --git
a/src/wx/timeline_dialog.cc
b/src/wx/timeline_dialog.cc
index 050f900534f7431e64724e4af2038985f36709e9..80686dc1749b552431d038a19866f9880574b56a 100644
(file)
--- a/
src/wx/timeline_dialog.cc
+++ b/
src/wx/timeline_dialog.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
8
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-33,10
+33,11
@@
using std::list;
using std::cout;
using std::string;
using boost::shared_ptr;
using std::cout;
using std::string;
using boost::shared_ptr;
+using boost::weak_ptr;
-TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
+TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film
, weak_ptr<FilmViewer> viewer
)
: wxDialog (
: wxDialog (
- cp->
panel
(),
+ cp->
window
(),
wxID_ANY,
_("Timeline"),
wxDefaultPosition,
wxID_ANY,
_("Timeline"),
wxDefaultPosition,
@@
-51,7
+52,7
@@
TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
#endif
)
, _film (film)
#endif
)
, _film (film)
- , _timeline (this, cp, film)
+ , _timeline (this, cp, film
, viewer
)
{
wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
{
wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);