'CheckMenuItem' conflicts with an item already existing in MSVC

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 251233a433b8f9f8ac5c40cb506c78e0d92fba1a..bbc78adf4a05759849f38cd6da30c6a5544e15e6 100644 (file)
--- 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 b8c4438be8a1179a3c4494b9b4fed74db7aee9ca..2e3b1ba8ef5b11a271c8a8a76ded4a8a1c04005a 100644 (file)
--- 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);
                }