X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_timing_panel.cc;h=c5ecd1f1f46ed663d03eaca624e759aa1302e89b;hb=3c29aa6531a4046a8db72dcac81189eb8893233c;hp=ae31e36c37066565a81c833fa58e3b99f1aeb5dd;hpb=3ee5431c7e270d7bf706fcf7530a6eb2c78480c3;p=dcpomatic.git

diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index ae31e36c3..c5ecd1f1f 100644
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -19,14 +19,14 @@
 */
 
 #include "kdm_timing_panel.h"
-#include "wx_util.h"
-#include "time_picker.h"
 #include "static_text.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "time_picker.h"
+#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/datectrl.h>
 #include <wx/dateevt.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 using std::cout;
 using boost::bind;
@@ -47,11 +47,16 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 #endif
 
 	wxSizer* table = new wxBoxSizer (wxHORIZONTAL);
-	add_label_to_sizer (table, this, _("From"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+	add_label_to_sizer (table, this, _("From"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	wxDateTime from;
 	from.SetToCurrent ();
 	_from_date = new wxDatePickerCtrl (this, wxID_ANY, from, wxDefaultPosition, size);
+#ifdef DCPOMATIC_OSX
+	/* Hack to tweak alignment, which I can't get right by "proper" means for some reason */
+	table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, 4);
+#else
 	table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL);
+#endif
 
 #ifdef __WXGTK3__
 	_from_time = new TimePickerText (this, from);
@@ -59,19 +64,19 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 	_from_time = new TimePickerSpin (this, from);
 #endif
 
-#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, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+	add_label_to_sizer (table, this, _("until"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	wxDateTime to = from;
 	/* 1 week from now */
 	to.Add (wxDateSpan (0, 0, 1, 0));
 	_until_date = new wxDatePickerCtrl (this, wxID_ANY, to, wxDefaultPosition, size);
+#ifdef DCPOMATIC_OSX
+	/* Hack to tweak alignment, which I can't get right by "proper" means for some reason */
+	table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, 4);
+#else
 	table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL);
+#endif
 
 #ifdef __WXGTK3__
 	_until_time = new TimePickerText (this, to);
@@ -79,13 +84,9 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 	_until_time = new TimePickerSpin (this, to);
 #endif
 
-#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);
+	overall_sizer->Add (table, 0, wxTOP, DCPOMATIC_SIZER_GAP);
 
 	_warning = new StaticText (this, wxT(""));
 	overall_sizer->Add (_warning, 0, wxTOP, DCPOMATIC_SIZER_GAP);