Hide warnings triggered by Ubuntu 20.04's gcc.

[dcpomatic.git] / src / wx / custom_scale_dialog.cc

diff --git a/src/wx/custom_scale_dialog.cc b/src/wx/custom_scale_dialog.cc
index 5725d2378144ede3684e767e5041233007d8869f..bb8be8e8024e26ca77fdb8539c255e2445a56a4c 100644 (file)
--- a/src/wx/custom_scale_dialog.cc
+++ b/src/wx/custom_scale_dialog.cc
@@ -23,9 +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 <wx/propgrid/property.h>
 #include <wx/propgrid/props.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using boost::optional;
@@ -46,13 +49,19 @@ 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(64, -1), wxSP_ARROW_KEYS, 1, film_container.width);
+       _width = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(spin_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(64, -1), wxSP_ARROW_KEYS, 1, film_container.height);
+       _height = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(spin_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(""));