Fix very wide spin button on Linux.

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

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 838ccee18e23b6c505f690a6c1692e56d5e7f3d3..aa3cf4b22d33677b308aa57b2e27f89739d8edb0 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -719,20 +719,21 @@ DCPPanel::make_video_panel ()
        _resolution_label = create_label (panel, _("Resolution"), true);
        _resolution = new wxChoice (panel, wxID_ANY);
 
+#ifdef __WXGTK3__
+       int const spin_width = 118;
+#else
+       int const spin_width = 56;
+#endif
+
        _frame_rate_label = create_label (panel, _("Frame Rate"), true);
        _frame_rate_choice = new wxChoice (panel, wxID_ANY);
-       _frame_rate_spin = new wxSpinCtrl (panel, wxID_ANY);
+       _frame_rate_spin = new SpinCtrl (panel, spin_width);
        setup_frame_rate_widget ();
        _best_frame_rate = new Button (panel, _("Use best"));
 
        _three_d = new CheckBox (panel, _("3D"));
 
        _j2k_bandwidth_label = create_label (panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true);
-#ifdef __WXGTK3__
-       int const spin_width = 118;
-#else
-       int const spin_width = 56;
-#endif
        _j2k_bandwidth = new SpinCtrl (panel, spin_width);
        _mbits_label = create_label (panel, _("Mbit/s"), false);
 
@@ -840,7 +841,7 @@ DCPPanel::make_audio_panel ()
        _audio_processor = new wxChoice (panel, wxID_ANY);
        add_audio_processors ();
 
-       _show_audio = new Button (panel, _("Show audio..."));
+       _show_audio = new Button (panel, _("Show graph of audio levels..."));
 
        _audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_channels_changed, this));
        _audio_processor->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_processor_changed, this));
@@ -895,7 +896,7 @@ DCPPanel::show_audio_clicked ()
 
        if (_audio_dialog) {
                _audio_dialog->Destroy ();
-               _audio_dialog = 0;
+               _audio_dialog = nullptr;
        }
 
        auto d = new AudioDialog (_panel, _film, _viewer);