Build fixes for Boost >= 1.73

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

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index e2e9d4ebe54f18f3022184f3e3cf26c3d647a63c..77dd643d72a80acd9731781583105b19fe14e772 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -36,9 +36,6 @@
 #include <wx/imaglist.h>
 #include <wx/spinctrl.h>
 #include <wx/preferences.h>
-#ifdef __WXOSX__
-#include <ApplicationServices/ApplicationServices.h>
-#endif
 #include <boost/foreach.hpp>
 
 using std::exception;
@@ -52,6 +49,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::bind;
 using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 class ContentDialog : public wxDialog, public ContentStore
 {
@@ -278,9 +278,9 @@ public:
                no_tick_icon.LoadFile ("no_tick.png", wxBITMAP_TYPE_PNG_RESOURCE);
 #else
                boost::filesystem::path tick_path = shared_path() / "tick.png";
-               tick_icon.LoadFile (std_to_wx(tick_path.string()));
+               tick_icon.LoadFile (std_to_wx(tick_path.string()), wxBITMAP_TYPE_PNG);
                boost::filesystem::path no_tick_path = shared_path() / "no_tick.png";
-               no_tick_icon.LoadFile (std_to_wx(no_tick_path.string()));
+               no_tick_icon.LoadFile (std_to_wx(no_tick_path.string()), wxBITMAP_TYPE_PNG);
 #endif
                images->Add (tick_icon);
                images->Add (no_tick_icon);
@@ -453,6 +453,7 @@ public:
        explicit DOMFrame (wxString const & title)
                : wxFrame (0, -1, title)
                , _content_dialog (new ContentDialog(this))
+               , _config_dialog (0)
        {
                wxMenuBar* bar = new wxMenuBar;
                setup_menu (bar);
@@ -573,7 +574,8 @@ private:
        bool OnInit ()
        try
        {
-               SetAppName (_("DCP-o-matic KDM Creator"));
+               wxInitAllImageHandlers ();
+               SetAppName (_("DCP-o-matic Playlist Editor"));
 
                if (!wxApp::OnInit()) {
                        return false;
@@ -583,10 +585,8 @@ private:
                unsetenv ("UBUNTU_MENUPROXY");
 #endif
 
-#ifdef __WXOSX__
-               ProcessSerialNumber serial;
-               GetCurrentProcess (&serial);
-               TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+#ifdef DCPOMATIC_OSX
+               make_foreground_application ();
 #endif
 
                dcpomatic_setup_path_encoding ();