Supporters update.

[dcpomatic.git] / src / wx / wx_util.cc

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index f36bcdf25a3dfe86c6c52045419e3ed880ffea9c..28ac6ab5c5b4bb4bace0bec0020ffd4c82aa1453 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -222,14 +222,14 @@ string_client_data (wxClientData* o)
 void
 checked_set (FilePickerCtrl* widget, boost::filesystem::path value)
 {
-       if (widget->GetPath() != std_to_wx (value.string())) {
+       if (widget->path() != value) {
                if (value.empty()) {
                        /* Hack to make wxWidgets clear the control when we are passed
                           an empty value.
                        */
                        value = " ";
                }
-               widget->SetPath (std_to_wx (value.string()));
+               widget->set_path(value);
        }
 }
 
@@ -443,8 +443,9 @@ dcpomatic_setup_i18n ()
                locale->AddCatalog (wxT ("wxstd3"));
 #endif
 
-               locale->AddCatalog (wxT ("libdcpomatic2-wx"));
-               locale->AddCatalog (wxT ("dcpomatic2"));
+               locale->AddCatalog(wxT("wxstd"));
+               locale->AddCatalog(wxT("libdcpomatic2-wx"));
+               locale->AddCatalog(wxT("dcpomatic2"));
 
                if (!locale->IsOk()) {
                        delete locale;
@@ -540,7 +541,7 @@ setup_audio_channels_choice (wxChoice* choice, int minimum)
 wxSplashScreen*
 maybe_show_splash ()
 {
-       wxSplashScreen* splash;
+       wxSplashScreen* splash = nullptr;
 
        try {
                wxBitmap bitmap;
@@ -669,6 +670,10 @@ bitmap_path (string name)
        } else {
                base = resources_path();
        }
+
+       if (!boost::filesystem::exists(base / name)) {
+               base = path / boost::filesystem::path("osx/preferences");
+       }
 #else
        base = resources_path();
 #endif