Basic implementation of a tree view for DKDMs (#1012).

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

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index f0ec44e6b2761f8ab5665128c6d86c6b15e2d793..a9cdb66999e46ea7d046f85ca07f7948c5c4be32 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -138,6 +138,7 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
        _grid->EnableEditing (false);
        _grid->SetCellHighlightPenWidth (0);
        _grid->SetDefaultRenderer (new NoSelectionStringRenderer);
+       _grid->EnableScrolling (true, true);
        _grid->AutoSize ();
 
        wxSizer* vertical_sizer = new wxBoxSizer (wxVERTICAL);
@@ -167,10 +168,10 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
        _menu->Append (ID_minus6dB, _("-6dB"));
        _menu->Append (ID_edit, _("Edit..."));
 
-       Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::off, this), ID_off);
-       Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::full, this), ID_full);
-       Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::minus6dB, this), ID_minus6dB);
-       Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::edit, this), ID_edit);
+       Bind (wxEVT_MENU, boost::bind (&AudioMappingView::off, this), ID_off);
+       Bind (wxEVT_MENU, boost::bind (&AudioMappingView::full, this), ID_full);
+       Bind (wxEVT_MENU, boost::bind (&AudioMappingView::minus6dB, this), ID_minus6dB);
+       Bind (wxEVT_MENU, boost::bind (&AudioMappingView::edit, this), ID_edit);
 
        _left_labels->Bind (wxEVT_MOTION, bind (&AudioMappingView::mouse_moved_left_labels, this, _1));
 }
@@ -271,7 +272,7 @@ AudioMappingView::set_output_channels (vector<string> const & names)
        if (o < _grid->GetNumberCols ()) {
                _grid->DeleteCols (o, _grid->GetNumberCols() - o);
        } else if (o > _grid->GetNumberCols ()) {
-               _grid->InsertCols (_grid->GetNumberCols(), o - _grid->GetNumberCols());
+               _grid->AppendCols (o - _grid->GetNumberCols());
        }
 
        _grid->SetColLabelValue (0, wxT (""));
@@ -282,6 +283,8 @@ AudioMappingView::set_output_channels (vector<string> const & names)
 
        update_cells ();
        setup_sizes ();
+
+       Layout ();
 }
 
 void
@@ -487,6 +490,10 @@ AudioMappingView::paint_top_labels ()
 void
 AudioMappingView::set_input_groups (vector<Group> const & groups)
 {
+       if (_grid->GetNumberRows() == 0) {
+               return;
+       }
+
        _input_groups = groups;
        _input_group_positions.clear ();