Change bitmap_path to take a full name with extension.

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 401fb1077d047c83921f329d1570f8413f6fe3ae..fe70ec6f716dade9aaa3f19b4cce98baea2101e6 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -29,16 +29,17 @@
 #include "lib/signaller.h"
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/taskbar.h>
-#include <wx/splash.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/icon.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/splash.h>
+#include <wx/taskbar.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 
+
 using std::cout;
 using std::string;
 using std::exception;
@@ -54,6 +55,7 @@ using std::dynamic_pointer_cast;
 using namespace boost::placeholders;
 #endif
 
+
 enum {
        ID_status = 1,
        ID_quit,
@@ -87,7 +89,7 @@ public:
        boost::signals2::signal<void(int)> Removed;
 
 private:
-       void do_log (shared_ptr<const LogEntry> entry)
+       void do_log (shared_ptr<const LogEntry> entry) override
        {
                time_t const s = entry->seconds ();
                struct tm* local = localtime (&s);
@@ -226,7 +228,7 @@ public:
                Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::quit, this), ID_quit);
        }
 
-       wxMenu* CreatePopupMenu ()
+       wxMenu* CreatePopupMenu () override
        {
                auto menu = new wxMenu;
                menu->Append (ID_status, std_to_wx ("Status..."));
@@ -241,7 +243,7 @@ public:
 #else
                string const colour = gui_is_dark() ? "white" : "black";
                wxBitmap bitmap (
-                       bitmap_path(String::compose("dcpomatic_small_%1", colour)),
+                       bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
                        wxBITMAP_TYPE_PNG
                        );
                wxIcon icon;
@@ -273,7 +275,7 @@ public:
 
 private:
 
-       bool OnInit ()
+       bool OnInit () override
        {
                if (!wxApp::OnInit()) {
                        return false;
@@ -327,7 +329,7 @@ private:
                return true;
        }
 
-       int OnExit ()
+       int OnExit () override
        {
                delete _icon;
                return wxApp::OnExit ();