Fix alignment of labels on macOS (#2043).

[dcpomatic.git] / src / wx / config_dialog.h

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index afbe9ed2ebe81e381cb0fba1658758e191ece458..9924909273a0b62c84f662adebb3f1fc0fd5f592 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -44,7 +44,6 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 class AudioMappingView;
@@ -85,7 +84,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("general", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -114,9 +113,9 @@ public:
                wxWindow* parent,
                wxString title,
                int border,
-               boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> set,
-               boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> get,
-               boost::function<bool (void)> nag_alter
+               std::function<void (std::shared_ptr<dcp::CertificateChain>)> set,
+               std::function<std::shared_ptr<const dcp::CertificateChain> (void)> get,
+               std::function<bool (void)> nag_alter
                );
 
        void add_button (wxWindow* button);
@@ -145,9 +144,9 @@ private:
        wxStaticText* _private_key_bad;
        wxSizer* _sizer;
        wxBoxSizer* _button_sizer;
-       boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> _set;
-       boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> _get;
-       boost::function<bool (void)> _nag_alter;
+       std::function<void (std::shared_ptr<dcp::CertificateChain>)> _set;
+       std::function<std::shared_ptr<const dcp::CertificateChain> (void)> _get;
+       std::function<bool (void)> _nag_alter;
 };
 
 class KeysPage : public Page
@@ -162,7 +161,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -192,7 +191,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("sound", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -232,15 +231,8 @@ private:
        void playlist_directory_changed ();
        void kdm_directory_changed ();
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       void background_image_changed ();
-#endif
-
        wxDirPickerCtrl* _content_directory;
        wxDirPickerCtrl* _playlist_directory;
        wxDirPickerCtrl* _kdm_directory;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       FilePickerCtrl* _background_image;
-#endif
 };
 #endif