X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fkdm_timing_panel.cc;h=998cd5a812c5158f0aa3a7f4701db1ddd2f65d2c;hb=8c39f950ec8f8b3cf4d258279ab499d7e71dafc8;hp=e0e5ac44f4a3c87b9dcc3e3982ec26fb23bd5af9;hpb=7f05d8fd54632f72a09b6be1b8b4cf692f290b55;p=dcpomatic.git

diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index e0e5ac44f..998cd5a81 100644
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -22,8 +22,11 @@
 #include "wx_util.h"
 #include "time_picker.h"
 #include "static_text.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/datectrl.h>
 #include <wx/dateevt.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::cout;
 using boost::bind;
@@ -33,34 +36,57 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 {
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
 
+#ifdef __WXGTK3__
+	/* wxDatePickerCtrl is too small with the GTK3 backend so we need to make it bigger with some fudge factors */
+	wxClientDC dc (parent);
+	wxSize size = dc.GetTextExtent (wxT("99/99/9999"));
+	size.SetWidth (size.GetWidth() * 1.75);
+	size.SetHeight (-1);
+#else
+	wxSize size = wxDefaultSize;
+#endif
+
 	wxSizer* table = new wxBoxSizer (wxHORIZONTAL);
-	add_label_to_sizer (table, this, _("From"), true);
+	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);
-	table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL);
-	_from_time = new TimePicker (this, from);
+	_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_time, 0, wxALIGN_CENTER_VERTICAL | wxTOP, 4);
+	table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, 4);
 #else
-	table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL);
+	table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL);
 #endif
 
-	add_label_to_sizer (table, this, _("until"), true);
+#ifdef __WXGTK3__
+	_from_time = new TimePickerText (this, from);
+#else
+	_from_time = new TimePickerSpin (this, from);
+#endif
+
+	table->Add (_from_time, 0, wxALIGN_CENTER_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);
-	table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL);
-	_until_time = new TimePicker (this, to);
+	_until_date = new wxDatePickerCtrl (this, wxID_ANY, to, wxDefaultPosition, size);
 #ifdef DCPOMATIC_OSX
-	table->Add (_until_time, 0, wxALIGN_CENTER_VERTICAL | wxTOP, 4);
+	/* 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_time, 0, wxALIGN_CENTER_VERTICAL);
+	table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL);
 #endif
 
-	overall_sizer->Add (table);
+#ifdef __WXGTK3__
+	_until_time = new TimePickerText (this, to);
+#else
+	_until_time = new TimePickerSpin (this, to);
+#endif
+
+	table->Add (_until_time, 0, wxALIGN_CENTER_VERTICAL);
+
+	overall_sizer->Add (table, 0, wxTOP, DCPOMATIC_SIZER_GAP);
 
 	_warning = new StaticText (this, wxT(""));
 	overall_sizer->Add (_warning, 0, wxTOP, DCPOMATIC_SIZER_GAP);