Change bitmap_path to take a full name with extension.

[dcpomatic.git] / src / wx / wx_util.cc

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 493743d4afebb92eb7d64e8b562fa60f0ed4795d..e94f3e512acf03322be4f09032a09d0147cceb1b 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -34,15 +34,15 @@
 #include "lib/job_manager.h"
 #include "lib/util.h"
 #include "lib/version.h"
-#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/splash.h>
 #include <wx/progdlg.h>
 #include <wx/filepicker.h>
 #include <wx/sizer.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 
@@ -101,7 +101,7 @@ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop, in
        setup_osx_flags (s, left, flags);
 #endif
        auto m = create_label (p, t, left);
-       s->Add (m, prop, flags, 6);
+       s->Add (m, prop, flags, DCPOMATIC_SIZER_GAP);
        return m;
 }
 
@@ -116,7 +116,7 @@ add_label_to_sizer (wxSizer* s, wxStaticText* t, bool, int prop, int flags)
 #ifdef __WXOSX__
        setup_osx_flags (s, left, flags);
 #endif
-       s->Add (t, prop, flags, 6);
+       s->Add (t, prop, flags, DCPOMATIC_SIZER_GAP);
        return t;
 }
 
@@ -517,7 +517,7 @@ maybe_show_splash ()
        wxSplashScreen* splash = nullptr;
        try {
                wxBitmap bitmap;
-               if (bitmap.LoadFile(bitmap_path("splash"), wxBITMAP_TYPE_PNG)) {
+               if (bitmap.LoadFile(bitmap_path("splash.png"), wxBITMAP_TYPE_PNG)) {
                        {
                                /* This wxMemoryDC must be destroyed before bitmap can be used elsewhere */
                                wxMemoryDC dc(bitmap);
@@ -646,7 +646,7 @@ bitmap_path (string name)
        base = resources_path();
 #endif
 
-       auto p = base / String::compose("%1.png", name);
+       auto p = base / name;
        return std_to_wx (p.string());
 }