#include "lib/compose.hpp"
#include "lib/cross.h"
#include "lib/playlist.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
#include <list>
using std::list;
-using std::cout;
-using std::string;
using std::shared_ptr;
+using std::string;
using std::weak_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
-TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
+TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmViewer& viewer)
: wxDialog (
cp->window(),
wxID_ANY,
{
auto sizer = new wxBoxSizer (wxVERTICAL);
- wxBitmap select (bitmap_path("select"), wxBITMAP_TYPE_PNG);
- wxBitmap zoom (bitmap_path("zoom"), wxBITMAP_TYPE_PNG);
- wxBitmap zoom_all (bitmap_path("zoom_all"), wxBITMAP_TYPE_PNG);
- wxBitmap snap (bitmap_path("snap"), wxBITMAP_TYPE_PNG);
- wxBitmap sequence (bitmap_path("sequence"), wxBITMAP_TYPE_PNG);
+ wxBitmap select(icon_path("select"), wxBITMAP_TYPE_PNG);
+ wxBitmap zoom(icon_path("zoom"), wxBITMAP_TYPE_PNG);
+ wxBitmap zoom_all(icon_path("zoom_all"), wxBITMAP_TYPE_PNG);
+ wxBitmap snap(icon_path("snap"), wxBITMAP_TYPE_PNG);
+ wxBitmap sequence(icon_path("sequence"), wxBITMAP_TYPE_PNG);
_toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL);
_toolbar->SetMargins (4, 4);