diff options
author | John Emmas <johne53@tiscali.co.uk> | 2017-02-04 16:11:14 +0000 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2017-02-04 16:14:55 +0000 |
commit | 70e4bb30a0928c2554d18d1de143f58c84f36af8 (patch) | |
tree | d8ca3167d371421a9fc23da02e221f006cdf5b9c /gtk2_ardour | |
parent | 8e06f43f8066c90c51552fa71fffaaa81d9f1944 (diff) |
'CheckMenuItem' conflicts with an item already existing in MSVC
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 2 | ||||
-rw-r--r-- | 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<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); 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<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); } |