X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.cc;h=2da375ecdca76886a680429e40cda753bd153958;hp=bc3e8db9931d45ae7de3b39787df38aa409633c6;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hpb=0dcbc398124f740e4fd7b552926f601a3e5c755e diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index bc3e8db99..2da375ecd 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -23,15 +23,16 @@ #include "film_editor.h" #include "timeline_dialog.h" #include "wx_util.h" +#include "content_panel.h" using std::list; using std::cout; using boost::shared_ptr; -TimelineDialog::TimelineDialog (FilmEditor* ed, shared_ptr film) - : wxDialog (ed, wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) +TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr film) + : wxDialog (cp->panel(), wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) , _film (film) - , _timeline (this, ed, film) + , _timeline (this, cp, film) { wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);