diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-15 19:40:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-11-15 19:40:37 +0000 |
| commit | 12a621982da4a7e0976829654ecc16026665c4e9 (patch) | |
| tree | d0e444aac84dd71be5edb1a0446acc0d327f2f22 /src | |
| parent | 66b61d621173cad85fdd99ef8eb67d75b0e0a2c1 (diff) | |
| parent | 688d9567d07e991c548b02ee8c1d651f8c5e312d (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/content_menu.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index fb255b360..2d49ac4be 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -50,7 +50,7 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; enum { - /* Start at 256 so we can have IDs on _cpl_menu from 0 to 255 */ + /* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */ ID_repeat = 256, ID_join, ID_find_missing, @@ -88,7 +88,7 @@ ContentMenu::ContentMenu (wxWindow* p) _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::ov, this), ID_ov); _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::remove, this), ID_remove); - _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 0, ID_repeat - 1); + _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 1, ID_repeat - 1); } ContentMenu::~ContentMenu () @@ -108,7 +108,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList _views = v; int const N = _cpl_menu->GetMenuItemCount(); - for (int i = 0; i < N; ++i) { + for (int i = 1; i <= N; ++i) { _cpl_menu->Delete (i); } @@ -135,7 +135,8 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList DCPExaminer ex (dcp); list<shared_ptr<dcp::CPL> > cpls = ex.cpls (); _choose_cpl->Enable (cpls.size() > 1); - int id = 0; + /* We can't have 0 as a menu item ID on OS X */ + int id = 1; BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) { wxMenuItem* item = _cpl_menu->AppendCheckItem ( id++, @@ -421,10 +422,11 @@ ContentMenu::cpl_selected (wxCommandEvent& ev) DCPExaminer ex (dcp); list<shared_ptr<dcp::CPL> > cpls = ex.cpls (); - DCPOMATIC_ASSERT (ev.GetId() < int (cpls.size())); + DCPOMATIC_ASSERT (ev.GetId() > 0); + DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size())); list<shared_ptr<dcp::CPL> >::const_iterator i = cpls.begin (); - for (int j = 0; j < ev.GetId(); ++j) { + for (int j = 0; j < ev.GetId() - 1; ++j) { ++i; } |