Cleanup: auto.

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

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index e600b63c89c4506e4b161b3b1f5a64617df1a8e8..5f5a96a46a6f956cfcf30ebbfd7ea78762d8de6c 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -125,14 +125,14 @@ add_label_to_sizer (wxSizer* s, wxStaticText* t, bool, int prop, int flags)
 
 
 wxStaticText *
-add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer(wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span, bool indent)
 {
-       int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
+       int flags = wxALIGN_CENTER_VERTICAL | wxLEFT;
 #ifdef __WXOSX__
        setup_osx_flags (s, left, flags);
 #endif
        auto m = create_label (p, t, left);
-       s->Add (m, pos, span, flags);
+       s->Add(m, pos, span, flags, indent ? DCPOMATIC_SIZER_X_GAP : 0);
        return m;
 }
 
@@ -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;
@@ -537,10 +538,10 @@ setup_audio_channels_choice (wxChoice* choice, int minimum)
 }
 
 
-wx_ptr<wxSplashScreen>
+wxSplashScreen*
 maybe_show_splash ()
 {
-       wx_ptr<wxSplashScreen> splash;
+       wxSplashScreen* splash = nullptr;
 
        try {
                wxBitmap bitmap;
@@ -555,9 +556,9 @@ maybe_show_splash ()
                        }
 #ifdef DCPOMATIC_WINDOWS
                        /* Having wxSTAY_ON_TOP means error dialogues hide behind the splash screen on Windows, no matter what I try */
-                       splash.reset(bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, nullptr, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE | wxFRAME_NO_TASKBAR);
+                       splash = new wxSplashScreen(bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, nullptr, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE | wxFRAME_NO_TASKBAR);
 #else
-                       splash.reset(bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, nullptr, -1);
+                       splash = new wxSplashScreen(bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, nullptr, -1);
 #endif
                        wxYield ();
                }