X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fmarkers_panel.cc;h=a110da105f5cb36318365b4119f2408e6b1af710;hb=a4d0c85dba60e2837814bd100547189b9a193fff;hp=1219da3f525e83862a7e9065b64f7448c67aba61;hpb=d394f2a171235fcbd5bdaf07c3b9b91529368538;p=dcpomatic.git diff --git a/src/wx/markers_panel.cc b/src/wx/markers_panel.cc index 1219da3f5..a110da105 100644 --- a/src/wx/markers_panel.cc +++ b/src/wx/markers_panel.cc @@ -23,8 +23,11 @@ #include "markers.h" #include "markers_panel.h" #include "wx_util.h" +#include +LIBDCP_DISABLE_WARNINGS #include #include +LIBDCP_ENABLE_WARNINGS #include #include @@ -62,7 +65,7 @@ MarkersPanel::MarkersPanel (wxWindow* parent, weak_ptr viewer) Bind (wxEVT_MENU, boost::bind(&MarkersPanel::move_marker_to_current_position, this), ID_move_marker_to_current_position); Bind (wxEVT_MENU, boost::bind(&MarkersPanel::remove_marker, this), ID_remove_marker); - Bind (wxEVT_MENU, boost::bind(&MarkersPanel::add_marker, this, _1), ID_add_base, ID_add_base + all_markers().size()); + Bind (wxEVT_MENU, boost::bind(&MarkersPanel::add_marker, this, _1), ID_add_base, ID_add_base + all_editable_markers().size()); } @@ -236,7 +239,7 @@ MarkersPanel::mouse_right_down (wxMouseEvent& ev) } auto add_marker = new wxMenu (); - for (auto const& marker: all_markers()) { + for (auto const& marker: all_editable_markers()) { add_marker->Append (static_cast(ID_add_base) + static_cast(marker.second), marker.first); } menu.Append (ID_add_marker, _("Add or move marker to current position"), add_marker);