X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline_dialog.cc;h=1c67622c2bffb21858dc405a17afb15fc3fd343d;hp=8cdc6d63d5cf52282534630055d92733c6fa12a1;hb=439b5d7a315daf2422cb6c995110d628a91d9389;hpb=313319ba2d8544bc25524e02e634804a503b54f1 diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 8cdc6d63d..1c67622c2 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -26,7 +26,10 @@ #include "lib/compose.hpp" #include "lib/cross.h" #include "lib/playlist.h" +#include +LIBDCP_DISABLE_WARNINGS #include +LIBDCP_ENABLE_WARNINGS #include @@ -60,11 +63,11 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr film, weak_pt { 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 (bitmap_path("select.png"), wxBITMAP_TYPE_PNG); + wxBitmap zoom (bitmap_path("zoom.png"), wxBITMAP_TYPE_PNG); + wxBitmap zoom_all (bitmap_path("zoom_all.png"), wxBITMAP_TYPE_PNG); + wxBitmap snap (bitmap_path("snap.png"), wxBITMAP_TYPE_PNG); + wxBitmap sequence (bitmap_path("sequence.png"), wxBITMAP_TYPE_PNG); _toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL); _toolbar->SetMargins (4, 4);