From 70e4bb30a0928c2554d18d1de143f58c84f36af8 Mon Sep 17 00:00:00 2001 From: John Emmas Date: Sat, 4 Feb 2017 16:11:14 +0000 Subject: [PATCH] 'CheckMenuItem' conflicts with an item already existing in MSVC --- gtk2_ardour/editor_ops.cc | 2 +- gtk2_ardour/editor_selection.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 251233a433..bbc78adf4a 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -5745,7 +5745,7 @@ Editor::toggle_region_lock_style () Glib::RefPtr a = Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-lock-style")); vector proxies = a->get_proxies(); - CheckMenuItem* cmi = dynamic_cast (proxies.front()); + Gtk::CheckMenuItem* cmi = dynamic_cast (proxies.front()); assert (cmi); diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index b8c4438be8..2e3b1ba8ef 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1305,7 +1305,7 @@ Editor::sensitize_the_right_region_actions () vector proxies = a->get_proxies(); for (vector::iterator p = proxies.begin(); p != proxies.end(); ++p) { - CheckMenuItem* cmi = dynamic_cast (*p); + Gtk::CheckMenuItem* cmi = dynamic_cast (*p); if (cmi) { cmi->set_inconsistent (have_position_lock_style_music && have_position_lock_style_audio); }