X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.h;h=ce2686864838e8a21f9dec1ce0a1c683e131f82b;hb=HEAD;hp=c767929f75f76fc9558bade2ca846b890e3e3620;hpb=439b5d7a315daf2422cb6c995110d628a91d9389;p=dcpomatic.git

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index c767929f7..ce2686864 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -33,7 +33,6 @@
 #include "lib/filter.h"
 #include "lib/log.h"
 #include "lib/ratio.h"
-#include "lib/util.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
@@ -49,6 +48,7 @@ LIBDCP_ENABLE_WARNINGS
 
 
 class AudioMappingView;
+class CheckBox;
 
 
 class Page : public wxPreferencesPage
@@ -88,7 +88,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("general.png"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("general"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -104,10 +104,10 @@ private:
 	void check_for_updates_changed ();
 	void check_for_test_updates_changed ();
 
-	wxCheckBox* _set_language;
+	CheckBox* _set_language;
 	wxChoice* _language;
-	wxCheckBox* _check_for_updates;
-	wxCheckBox* _check_for_test_updates;
+	CheckBox* _check_for_updates;
+	CheckBox* _check_for_test_updates;
 };
 
 
@@ -166,7 +166,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("keys.png"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("keys"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -197,7 +197,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("sound.png"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("sound"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -212,7 +212,7 @@ private:
 	void map_changed (AudioMapping m);
 	void reset_to_default ();
 
-	wxCheckBox* _sound;
+	CheckBox* _sound;
 	wxChoice* _sound_output;
 	wxStaticText* _sound_output_details;
 	AudioMappingView* _map;