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 6f06c0624e91109475a6b320c4ca5e8a56ed6fa1..dea8e81d5b84b6204e51ee0fefbca05552684261 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -19,12 +19,12 @@
 */
 
 
-#include "wx/wx_util.h"
-#include "wx/wx_signal_manager.h"
+#include "wx/about_dialog.h"
 #include "wx/content_view.h"
 #include "wx/dcpomatic_button.h"
-#include "wx/about_dialog.h"
 #include "wx/playlist_editor_config_dialog.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
 #include "lib/config.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
@@ -32,11 +32,14 @@
 #include "lib/spl.h"
 #include "lib/spl_entry.h"
 #include "lib/util.h"
-#include <wx/wx.h>
-#include <wx/listctrl.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/imaglist.h>
-#include <wx/spinctrl.h>
+#include <wx/listctrl.h>
 #include <wx/preferences.h>
+#include <wx/spinctrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;
@@ -85,7 +88,7 @@ public:
                return _content_view->selected ();
        }
 
-       shared_ptr<Content> get (string digest) const
+       shared_ptr<Content> get (string digest) const override
        {
                return _content_view->get (digest);
        }
@@ -279,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);
 
@@ -590,7 +593,7 @@ public:
 
 private:
 
-       bool OnInit ()
+       bool OnInit () override
        try
        {
                wxInitAllImageHandlers ();
@@ -645,7 +648,7 @@ private:
        }
 
        /* An unhandled exception has occurred inside the main event loop */
-       bool OnExceptionInMainLoop ()
+       bool OnExceptionInMainLoop () override
        {
                try {
                        throw;
@@ -674,7 +677,7 @@ private:
                return false;
        }
 
-       void OnUnhandledException ()
+       void OnUnhandledException () override
        {
                error_dialog (0, _("An unknown exception occurred.") + "  " + REPORT_PROBLEM);
        }