X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_config_dialog.cc;h=a7bb35bda427beca8e2e4b2f68f57d1ab46c119d;hb=5ee919f413a6c1048aecf83676d42ab3fd94e06e;hp=8cedd12e5fe84af5a7590921c5e262437702dd00;hpb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;p=dcpomatic.git

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 8cedd12e5..a7bb35bda 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -45,16 +45,16 @@
 #include "lib/log.h"
 #include "lib/ratio.h"
 #include "lib/util.h"
-#include "lib/warnings.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
 
@@ -133,7 +133,7 @@ private:
 		_player_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::player_mode_changed, this));
 		_image_display->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::image_display_changed, this));
 		_video_display_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::video_display_mode_changed, this));
-		_respect_kdm->Bind (wxEVT_CHECKBOX, bind(&PlayerGeneralPage::respect_kdm_changed, this));
+		_respect_kdm->bind(&PlayerGeneralPage::respect_kdm_changed, this);
 		_debug_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::debug_log_file_changed, this));
 	}
 
@@ -214,7 +214,7 @@ private:
 	wxChoice* _player_mode;
 	wxChoice* _image_display;
 	wxChoice* _video_display_mode;
-	wxCheckBox* _respect_kdm;
+	CheckBox* _respect_kdm;
 	FilePickerCtrl* _debug_log_file;
 };
 
@@ -241,7 +241,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE);
+		return wxBitmap(icon_path("advanced"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -284,12 +284,12 @@ private:
 		table->AddSpacer (0);
 #endif
 
-		_log_general->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
-		_log_warning->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
-		_log_error->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
-		_log_timing->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
+		_log_general->bind(&PlayerAdvancedPage::log_changed, this);
+		_log_warning->bind(&PlayerAdvancedPage::log_changed, this);
+		_log_error->bind(&PlayerAdvancedPage::log_changed, this);
+		_log_timing->bind(&PlayerAdvancedPage::log_changed, this);
 #ifdef DCPOMATIC_WINDOWS
-		_win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::win32_console_changed, this));
+		_win32_console->bind(&PlayerAdvancedPage::win32_console_changed, this);
 #endif
 	}
 
@@ -331,12 +331,12 @@ private:
 	}
 #endif
 
-	wxCheckBox* _log_general;
-	wxCheckBox* _log_warning;
-	wxCheckBox* _log_error;
-	wxCheckBox* _log_timing;
+	CheckBox* _log_general;
+	CheckBox* _log_warning;
+	CheckBox* _log_error;
+	CheckBox* _log_timing;
 #ifdef DCPOMATIC_WINDOWS
-	wxCheckBox* _win32_console;
+	CheckBox* _win32_console;
 #endif
 };