'CheckMenuItem' conflicts with an item already existing in MSVC

This commit is contained in:
John Emmas 2017-02-04 16:11:14 +00:00
parent 8e06f43f80
commit 70e4bb30a0
2 changed files with 2 additions and 2 deletions

View File

@ -5745,7 +5745,7 @@ Editor::toggle_region_lock_style ()
Glib::RefPtr<ToggleAction> a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock-style"));
vector<Widget*> proxies = a->get_proxies();
CheckMenuItem* cmi = dynamic_cast<CheckMenuItem*> (proxies.front());
Gtk::CheckMenuItem* cmi = dynamic_cast<Gtk::CheckMenuItem*> (proxies.front());
assert (cmi);

View File

@ -1305,7 +1305,7 @@ Editor::sensitize_the_right_region_actions ()
vector<Widget*> proxies = a->get_proxies();
for (vector<Widget*>::iterator p = proxies.begin(); p != proxies.end(); ++p) {
CheckMenuItem* cmi = dynamic_cast<CheckMenuItem*> (*p);
Gtk::CheckMenuItem* cmi = dynamic_cast<Gtk::CheckMenuItem*> (*p);
if (cmi) {
cmi->set_inconsistent (have_position_lock_style_music && have_position_lock_style_audio);
}