X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.h;h=9924909273a0b62c84f662adebb3f1fc0fd5f592;hb=e72a69ac2ebf24df05ba4b6de65bfa338a58b0ec;hp=818ab4def911545f714138859779832495f436f2;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 818ab4def..992490927 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -84,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
 
@@ -113,9 +113,9 @@ public:
 		wxWindow* parent,
 		wxString title,
 		int border,
-		boost::function<void (std::shared_ptr<dcp::CertificateChain>)> set,
-		boost::function<std::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);
@@ -144,9 +144,9 @@ private:
 	wxStaticText* _private_key_bad;
 	wxSizer* _sizer;
 	wxBoxSizer* _button_sizer;
-	boost::function<void (std::shared_ptr<dcp::CertificateChain>)> _set;
-	boost::function<std::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
@@ -161,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
 
@@ -191,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