Tidy up; rename add_label_to_grid_bag_sizer -> add_label_to_sizer.

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 8aca290cbbdbb323d74f010fee0a6bbd8b9085a5..8e13225c76cd32da086d7c7dcf8829b5ba691bde 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -66,7 +66,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
                ++r;
        }
 
-       add_label_to_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
        _gain = new ContentSpinCtrlDouble<AudioContent> (
                this,
                new wxSpinCtrlDouble (this),
@@ -76,12 +76,12 @@ AudioPanel::AudioPanel (ContentPanel* p)
                );
 
        _gain->add (grid, wxGBPosition (r, 1));
-       add_label_to_grid_bag_sizer (grid, this, _("dB"), false, wxGBPosition (r, 2));
+       add_label_to_sizer (grid, this, _("dB"), false, wxGBPosition (r, 2));
        _gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate..."));
        grid->Add (_gain_calculate_button, wxGBPosition (r, 3));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0));
        _delay = new ContentSpinCtrl<AudioContent> (
                this,
                new wxSpinCtrl (this),
@@ -92,7 +92,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
 
        _delay->add (grid, wxGBPosition (r, 1));
        /// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-       add_label_to_grid_bag_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2));
+       add_label_to_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2));
        ++r;
 
        _mapping = new AudioMappingView (this);

diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 1d164cb334e4ada2029af231d7511cdb08cb72dd..92dd417a534d51a1c61999bc429d78e41ea5b35f 100644 (file)
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -52,12 +52,12 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
        table->Add (_input_gamma_linearised, wxGBPosition (r, 0), wxGBSpan (1, 2));
        ++r;
 
-       add_label_to_grid_bag_sizer (table, this, _("Input gamma"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (table, this, _("Input gamma"), true, wxGBPosition (r, 0));
        _input_gamma = new wxSpinCtrlDouble (this);
        table->Add (_input_gamma, wxGBPosition (r, 1));
        ++r;
 
-       add_label_to_grid_bag_sizer (table, this, _("Input power"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (table, this, _("Input power"), true, wxGBPosition (r, 0));
        {
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _input_power = new wxSpinCtrlDouble (this);
@@ -94,7 +94,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
 
        subhead (table, this, _("YUV to RGB conversion"), r);
 
-       add_label_to_grid_bag_sizer (table, this, _("YUV to RGB matrix"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (table, this, _("YUV to RGB matrix"), true, wxGBPosition (r, 0));
        _yuv_to_rgb = new wxChoice (this, wxID_ANY);
        _yuv_to_rgb->Append (_("Rec. 601"));
        _yuv_to_rgb->Append (_("Rec. 709"));
@@ -105,33 +105,33 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
 
        subhead (table, this, _("RGB to XYZ conversion"), r);
 
-       add_label_to_grid_bag_sizer (table, this, _("x"), false, wxGBPosition (r, 1));
-       add_label_to_grid_bag_sizer (table, this, _("y"), false, wxGBPosition (r, 2));
-       add_label_to_grid_bag_sizer (table, this, _("Matrix"), false, wxGBPosition (r, 3));
+       add_label_to_sizer (table, this, _("x"), false, wxGBPosition (r, 1));
+       add_label_to_sizer (table, this, _("y"), false, wxGBPosition (r, 2));
+       add_label_to_sizer (table, this, _("Matrix"), false, wxGBPosition (r, 3));
        ++r;
 
-       add_label_to_grid_bag_sizer (table, this, _("Red chromaticity"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (table, this, _("Red chromaticity"), true, wxGBPosition (r, 0));
        _red_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
        table->Add (_red_x, wxGBPosition (r, 1));
        _red_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
        table->Add (_red_y, wxGBPosition (r, 2));
        ++r;
 
-       add_label_to_grid_bag_sizer (table, this, _("Green chromaticity"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (table, this, _("Green chromaticity"), true, wxGBPosition (r, 0));
        _green_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
        table->Add (_green_x, wxGBPosition (r, 1));
        _green_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
        table->Add (_green_y, wxGBPosition (r, 2));
        ++r;
 
-       add_label_to_grid_bag_sizer (table, this, _("Blue chromaticity"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (table, this, _("Blue chromaticity"), true, wxGBPosition (r, 0));
        _blue_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
        table->Add (_blue_x, wxGBPosition (r, 1));
        _blue_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
        table->Add (_blue_y, wxGBPosition (r, 2));
        ++r;
 
-       add_label_to_grid_bag_sizer (table, this, _("White point"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (table, this, _("White point"), true, wxGBPosition (r, 0));
        _white_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
        table->Add (_white_x, wxGBPosition (r, 1));
        _white_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
@@ -165,7 +165,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
        table->Add (_adjusted_white_y, wxGBPosition (r, 2));
        ++r;
 
-       add_label_to_grid_bag_sizer (table, this, wxT (""), false, wxGBPosition (r, 0));
+       add_label_to_sizer (table, this, wxT (""), false, wxGBPosition (r, 0));
        ++r;
 
         size = dc.GetTextExtent (wxT ("0.12345678"));

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 1b96a1aaddb77f7a2a41e105262eab15a83f223d..61c526c3c40deaf1776dfd06b184c552f09c748c 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -171,7 +171,7 @@ private:
                table->Add (_language, wxGBPosition (r, 1));
                ++r;
 
-               wxStaticText* restart = add_label_to_grid_bag_sizer (
+               wxStaticText* restart = add_label_to_sizer (
                        table, _panel, _("(restart DCP-o-matic to see language changes)"), false, wxGBPosition (r, 0), wxGBSpan (1, 2)
                        );
                wxFont font = restart->GetFont();
@@ -180,7 +180,7 @@ private:
                restart->SetFont (font);
                ++r;
 
-               add_label_to_grid_bag_sizer (table, _panel, _("Threads to use for encoding on this host"), true, wxGBPosition (r, 0));
+               add_label_to_sizer (table, _panel, _("Threads to use for encoding on this host"), true, wxGBPosition (r, 0));
                _num_local_encoding_threads = new wxSpinCtrl (_panel);
                table->Add (_num_local_encoding_threads, wxGBPosition (r, 1));
                ++r;
@@ -681,7 +681,7 @@ public:
                _sizer->Add (table, 1, wxALL | wxEXPAND, border);
                int r = 0;
 
-               add_label_to_grid_bag_sizer (table, this, _("Leaf private key"), true, wxGBPosition (r, 0));
+               add_label_to_sizer (table, this, _("Leaf private key"), true, wxGBPosition (r, 0));
                _private_key = new wxStaticText (this, wxID_ANY, wxT (""));
                wxFont font = _private_key->GetFont ();
                font.SetFamily (wxFONTFAMILY_TELETYPE);

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 3fc137b3f71f2d8a152f39caf7ca6ae3005cc496..bd83a7a47bb1725487bfcac0e7d3b20e2e654116 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -64,7 +64,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
 
        int r = 0;
 
-       add_label_to_grid_bag_sizer (grid, _panel, _("Name"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, _panel, _("Name"), true, wxGBPosition (r, 0));
        _name = new wxTextCtrl (_panel, wxID_ANY);
        grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
        ++r;
@@ -98,7 +98,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
        grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0));
        _dcp_content_type = new wxChoice (_panel, wxID_ANY);
        grid->Add (_dcp_content_type, wxGBPosition (r, 1));
        ++r;
@@ -122,7 +122,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
         size.SetHeight (-1);
 
        {
-               add_label_to_grid_bag_sizer (grid, _panel, _("Key"), true, wxGBPosition (r, 0));
+               add_label_to_sizer (grid, _panel, _("Key"), true, wxGBPosition (r, 0));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _key = new wxStaticText (_panel, wxID_ANY, "", wxDefaultPosition, size);
                s->Add (_key, 1, wxALIGN_CENTER_VERTICAL);
@@ -132,12 +132,12 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
                ++r;
        }
 
-       add_label_to_grid_bag_sizer (grid, _panel, _("Reels"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, _panel, _("Reels"), true, wxGBPosition (r, 0));
        _reel_type = new wxChoice (_panel, wxID_ANY);
        grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, _panel, _("Reel length"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, _panel, _("Reel length"), true, wxGBPosition (r, 0));
 
        {
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
@@ -148,7 +148,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
                ++r;
        }
 
-       add_label_to_grid_bag_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0));
        _standard = new wxChoice (_panel, wxID_ANY);
        grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
        ++r;
@@ -605,7 +605,7 @@ DCPPanel::make_video_panel ()
 
        int r = 0;
 
-       add_label_to_grid_bag_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0));
        {
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _container = new wxChoice (panel, wxID_ANY);
@@ -616,7 +616,7 @@ DCPPanel::make_video_panel ()
                ++r;
        }
 
-       add_label_to_grid_bag_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0));
        {
                _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL);
                _frame_rate_choice = new wxChoice (panel, wxID_ANY);
@@ -634,13 +634,13 @@ DCPPanel::make_video_panel ()
        grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, panel, _("Resolution"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, panel, _("Resolution"), true, wxGBPosition (r, 0));
        _resolution = new wxChoice (panel, wxID_ANY);
        grid->Add (_resolution, wxGBPosition (r, 1));
        ++r;
 
        {
-               add_label_to_grid_bag_sizer (grid, panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0));
+               add_label_to_sizer (grid, panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0));
                wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _j2k_bandwidth = new wxSpinCtrl (panel, wxID_ANY);
                s->Add (_j2k_bandwidth, 1);
@@ -715,13 +715,13 @@ DCPPanel::make_audio_panel ()
 
        int r = 0;
 
-       add_label_to_grid_bag_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0));
        _audio_channels = new wxChoice (panel, wxID_ANY);
        setup_audio_channels_choice ();
        grid->Add (_audio_channels, wxGBPosition (r, 1));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, panel, _("Processor"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, panel, _("Processor"), true, wxGBPosition (r, 0));
        _audio_processor = new wxChoice (panel, wxID_ANY);
        _audio_processor->Append (_("None"), new wxStringClientData (N_("none")));
        BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::all ()) {

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index afbce2a25a16036118e9a63cc2ff4344c5d07b8a..e9de4fccd0bcca0e18c6761beea9974c3a21df84 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -63,7 +63,7 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p)
        ++r;
 
        {
-               add_label_to_grid_bag_sizer (grid, this, _("X Offset"), true, wxGBPosition (r, 0));
+               add_label_to_sizer (grid, this, _("X Offset"), true, wxGBPosition (r, 0));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _x_offset = new wxSpinCtrl (this);
                s->Add (_x_offset);
@@ -73,7 +73,7 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p)
        }
 
        {
-               add_label_to_grid_bag_sizer (grid, this, _("Y Offset"), true, wxGBPosition (r, 0));
+               add_label_to_sizer (grid, this, _("Y Offset"), true, wxGBPosition (r, 0));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _y_offset = new wxSpinCtrl (this);
                s->Add (_y_offset);
@@ -83,7 +83,7 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p)
        }
 
        {
-               add_label_to_grid_bag_sizer (grid, this, _("X Scale"), true, wxGBPosition (r, 0));
+               add_label_to_sizer (grid, this, _("X Scale"), true, wxGBPosition (r, 0));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _x_scale = new wxSpinCtrl (this);
                s->Add (_x_scale);
@@ -93,7 +93,7 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p)
        }
 
        {
-               add_label_to_grid_bag_sizer (grid, this, _("Y Scale"), true, wxGBPosition (r, 0));
+               add_label_to_sizer (grid, this, _("Y Scale"), true, wxGBPosition (r, 0));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _y_scale = new wxSpinCtrl (this);
                s->Add (_y_scale);
@@ -102,12 +102,12 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p)
                ++r;
        }
 
-       add_label_to_grid_bag_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0));
        _language = new wxTextCtrl (this, wxID_ANY);
        grid->Add (_language, wxGBPosition (r, 1));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
        _stream = new wxChoice (this, wxID_ANY);
        grid->Add (_stream, wxGBPosition (r, 1));
        ++r;

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 79ea9dbfa3e99e4b05200ac0972c4867d654d0d2..227f6c6477e8c6e375adb0f88c438b3a44566012 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -81,7 +81,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
        grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Type"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Type"), true, wxGBPosition (r, 0));
        _frame_type = new ContentChoice<VideoContent, VideoFrameType> (
                this,
                new wxChoice (this, wxID_ANY),
@@ -94,12 +94,12 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _frame_type->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Crop"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Crop"), true, wxGBPosition (r, 0));
 
        int cr = 0;
        wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
-       add_label_to_grid_bag_sizer (crop, this, _("Left"), true, wxGBPosition (cr, 0));
+       add_label_to_sizer (crop, this, _("Left"), true, wxGBPosition (cr, 0));
        _left_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
@@ -109,7 +109,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
                );
        _left_crop->add (crop, wxGBPosition (cr, 1));
 
-       add_label_to_grid_bag_sizer (crop, this, _("Right"), true, wxGBPosition (cr, 2));
+       add_label_to_sizer (crop, this, _("Right"), true, wxGBPosition (cr, 2));
        _right_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
@@ -121,7 +121,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 
        ++cr;
 
-       add_label_to_grid_bag_sizer (crop, this, _("Top"), true, wxGBPosition (cr, 0));
+       add_label_to_sizer (crop, this, _("Top"), true, wxGBPosition (cr, 0));
        _top_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
@@ -131,7 +131,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
                );
        _top_crop->add (crop, wxGBPosition (cr, 1));
 
-       add_label_to_grid_bag_sizer (crop, this, _("Bottom"), true, wxGBPosition (cr, 2));
+       add_label_to_sizer (crop, this, _("Bottom"), true, wxGBPosition (cr, 2));
        _bottom_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
@@ -144,17 +144,17 @@ VideoPanel::VideoPanel (ContentPanel* p)
        grid->Add (crop, wxGBPosition (r, 1), wxGBSpan (2, 3));
        r += 2;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0));
        _fade_in = new Timecode<ContentTime> (this);
        grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Fade out"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Fade out"), true, wxGBPosition (r, 0));
        _fade_out = new Timecode<ContentTime> (this);
        grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0));
        _scale = new ContentChoice<VideoContent, VideoContentScale> (
                this,
                new wxChoice (this, wxID_ANY),
@@ -171,7 +171,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
        wxSize size = dc.GetTextExtent (wxT ("A quite long name"));
        size.SetHeight (-1);
 
-       add_label_to_grid_bag_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0));
        {
                wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 
@@ -184,7 +184,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
        }
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
        {
                wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index fb10eedc0af17fb247841cdd3e04bc08f6536b84..1e990c49515c13393c403c3e7c7680f807e6f3a3 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -60,9 +60,9 @@ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop)
 
 wxStaticText *
 #ifdef __WXOSX__
-add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
 #else
-add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span)
 #endif
 {
        int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index dcf1377388eb6466e8801f3953246fb25495e35e..aaa59c4acac8456d1c688ebd94f8ee423dd94a43 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -61,7 +61,7 @@ extern void error_dialog (wxWindow *, wxString);
 extern void message_dialog (wxWindow *, wxString);
 extern bool confirm_dialog (wxWindow *, wxString);
 extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0);
-extern wxStaticText* add_label_to_grid_bag_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
+extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
 extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);
 extern void dcpomatic_setup_i18n ();