X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcustom_scale_dialog.cc;h=e750b9baa053d60bb5628503e839c31c3ff4b5dd;hb=aef453a8e337ccbf574c7c370b3c86b992141619;hp=8a5f9e12861475f607639a4ff539ac72347722ce;hpb=f217438d011282515476fbec6307e36dd7c0ffe9;p=dcpomatic.git

diff --git a/src/wx/custom_scale_dialog.cc b/src/wx/custom_scale_dialog.cc
index 8a5f9e128..e750b9baa 100644
--- a/src/wx/custom_scale_dialog.cc
+++ b/src/wx/custom_scale_dialog.cc
@@ -23,12 +23,12 @@
 #include "wx_util.h"
 #include "lib/util.h"
 #include <dcp/raw_convert.h>
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/propgrid/property.h>
 #include <wx/propgrid/props.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using boost::optional;
@@ -49,19 +49,13 @@ CustomScaleDialog::CustomScaleDialog (wxWindow* parent, dcp::Size initial, dcp::
 	_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, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
-	_height = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(spin_width, -1), wxSP_ARROW_KEYS, 1, film_container.height);
+	_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(""));