Fix crash when adding cinemas while a search is in force (#2378).
[dcpomatic.git] / src / wx / config_dialog.h
index 3e71cb11ad75c75345c8e7553cc9a1a6691d3376..e0d7f15b8447cc1c9f59f35f6ab5113882671a7d 100644 (file)
@@ -49,6 +49,7 @@ LIBDCP_ENABLE_WARNINGS
 
 
 class AudioMappingView;
+class CheckBox;
 
 
 class Page : public wxPreferencesPage
@@ -88,7 +89,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const override
        {
-               return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
+               return wxBitmap(icon_path("general"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -104,10 +105,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 +167,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const override
        {
-               return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
+               return wxBitmap(icon_path("keys"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -197,7 +198,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const override
        {
-               return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
+               return wxBitmap(icon_path("sound"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -212,7 +213,7 @@ private:
        void map_changed (AudioMapping m);
        void reset_to_default ();
 
-       wxCheckBox* _sound;
+       CheckBox* _sound;
        wxChoice* _sound_output;
        wxStaticText* _sound_output_details;
        AudioMappingView* _map;