X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=a9cdb66999e46ea7d046f85ca07f7948c5c4be32;hb=69829c8c664d301de3f123f9893210eea89d8026;hp=cb3cc786ff7d00d679ac0e834d60c41c72d198ee;hpb=df28b0e939bd0f12ae31e6f7ba94fa954496b3b8;p=dcpomatic.git

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index cb3cc786f..a9cdb6699 100644
--- 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