#include "wx_util.h"
#include "lib/util.h"
#include <dcp/raw_convert.h>
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/propgrid/property.h>
#include <wx/propgrid/props.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
using boost::optional;
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_ratio = new wxTextCtrl (this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, wxNumericPropertyValidator(wxNumericPropertyValidator::Float));
s->Add (_ratio, 1, wxRIGHT, 4);
- add_label_to_sizer (s, this, wxT(":1"), false);
+ add_label_to_sizer (s, this, wxT(":1"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
add (s);
_size_from_ratio = new wxStaticText (this, wxID_ANY, wxT(""));
add (_size_from_ratio, 1, wxALIGN_CENTER_VERTICAL);
-#ifdef __WXGTK3__
- int const spin_width = 118;
-#else
- int const spin_width = 64;
-#endif
-
_size = new wxRadioButton (this, wxID_ANY, _("Set size"));
add (_size);
s = new wxBoxSizer (wxHORIZONTAL);
- _width = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(spin_width, -1), wxSP_ARROW_KEYS, 1, film_container.width);
+ _width = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(DCPOMATIC_SPIN_CTRL_WIDTH, -1), wxSP_ARROW_KEYS, 1, film_container.width);
s->Add (_width, 1, wxRIGHT, 4);
- add_label_to_sizer (s, this, wxT("x"), false);
- _height = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(spin_width, -1), wxSP_ARROW_KEYS, 1, film_container.height);
+ add_label_to_sizer (s, this, wxT("x"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+ _height = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(DCPOMATIC_SPIN_CTRL_WIDTH, -1), wxSP_ARROW_KEYS, 1, film_container.height);
s->Add (_height, 1, wxRIGHT, 4);
add (s);
_ratio_from_size = new wxStaticText (this, wxID_ANY, wxT(""));