Change bitmap_path to take a full name with extension.

[dcpomatic.git] / src / tools / dcpomatic_playlist.cc

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 5bae0c4297687a37eb2958e8964966471003c9ed..dea8e81d5b84b6204e51ee0fefbca05552684261 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -32,14 +32,14 @@
 #include "lib/spl.h"
 #include "lib/spl_entry.h"
 #include "lib/util.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/imaglist.h>
 #include <wx/listctrl.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;
@@ -282,8 +282,8 @@ public:
                auto images = new wxImageList (16, 16);
                wxIcon tick_icon;
                wxIcon no_tick_icon;
-               tick_icon.LoadFile (bitmap_path("tick"), wxBITMAP_TYPE_PNG);
-               no_tick_icon.LoadFile (bitmap_path("no_tick"), wxBITMAP_TYPE_PNG);
+               tick_icon.LoadFile (bitmap_path("tick.png"), wxBITMAP_TYPE_PNG);
+               no_tick_icon.LoadFile (bitmap_path("no_tick.png"), wxBITMAP_TYPE_PNG);
                images->Add (tick_icon);
                images->Add (no_tick_icon);