More tidying up.

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

diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index 613b62cbf19e29b6b0e2154394e872e3b8a52a00..bad900d2768c5e5c3c29c4b4a88316596b19d341 100644 (file)
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,6 +21,7 @@
 #include "kdm_timing_panel.h"
 #include "wx_util.h"
 #include "time_picker.h"
+#include "static_text.h"
 #include <wx/datectrl.h>
 #include <wx/dateevt.h>
 
@@ -37,22 +38,31 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
        wxDateTime from;
        from.SetToCurrent ();
        _from_date = new wxDatePickerCtrl (this, wxID_ANY, from);
-       table->Add (_from_date);
+       table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL);
        _from_time = new TimePicker (this, from);
-       table->Add (_from_time);
+#ifdef DCPOMATIC_OSX
+       /* Hack to tweak alignment, which I can't get right by "proper" means for some reason */
+       table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL | wxTOP, 4);
+#else
+       table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL);
+#endif
 
        add_label_to_sizer (table, this, _("until"), true);
        wxDateTime to = from;
        /* 1 week from now */
        to.Add (wxDateSpan (0, 0, 1, 0));
        _until_date = new wxDatePickerCtrl (this, wxID_ANY, to);
-       table->Add (_until_date);
+       table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL);
        _until_time = new TimePicker (this, to);
-       table->Add (_until_time);
+#ifdef DCPOMATIC_OSX
+       table->Add (_until_time, 0, wxALIGN_CENTER_VERTICAL | wxTOP, 4);
+#else
+       table->Add (_until_time, 0, wxALIGN_CENTER_VERTICAL);
+#endif
 
        overall_sizer->Add (table);
 
-       _warning = new wxStaticText (this, wxID_ANY, wxT (""));
+       _warning = new StaticText (this, wxT(""));
        overall_sizer->Add (_warning, 0, wxTOP, DCPOMATIC_SIZER_GAP);
        wxFont font = _warning->GetFont();
        font.SetStyle(wxFONTSTYLE_ITALIC);