- _from_date = new wxDatePickerCtrl (this, wxID_ANY, from);
- table->Add (_from_date, 1, wxEXPAND);
- _from_time = new TimePicker (this, from);
- table->Add (_from_time, 0);
-
- add_label_to_sizer (table, this, _("until"), true);
+ _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);
+#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);