MSVC itself defines a class called CheckMenuItem - so make sure we know to use the...

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index a4c65475c5dc2cd84ae6a50d4a5d77f63c0781ea..439a0ee5a514e79869dd7592a725af8ccc3c06c5 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -2488,7 +2488,7 @@ MixerStrip::set_meter_type (MeterType t)
 }
 
 void
-MixerStrip::vca_menu_toggle (CheckMenuItem* menuitem, uint32_t n)
+MixerStrip::vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n)
 {
        if (!_route) {
                return;
@@ -2569,7 +2569,7 @@ MixerStrip::vca_button_release (GdkEventButton* ev)
 
        for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
                items.push_back (CheckMenuElem ((*v)->name()));
-               CheckMenuItem* item = dynamic_cast<CheckMenuItem*> (&items.back());
+               Gtk::CheckMenuItem* item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
                if (_route->slaved_to (*v)) {
                        item->set_active (true);
                }

diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc
index d2e6523f52a8875485494abe22b213517f6b86c3..087e5621975d54f4fc5a3d8602743e999cdb0083 100644 (file)
--- a/gtk2_ardour/vca_master_strip.cc
+++ b/gtk2_ardour/vca_master_strip.cc
@@ -363,7 +363,7 @@ VCAMasterStrip::solo_changed ()
 }
 
 void
-VCAMasterStrip::vca_menu_toggle (CheckMenuItem* menuitem, uint32_t n)
+VCAMasterStrip::vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n)
 {
        boost::shared_ptr<VCA> vca = _session->vca_manager().vca_by_number (n);
 
@@ -423,7 +423,7 @@ VCAMasterStrip::vca_button_release (GdkEventButton* ev)
                }
 
                items.push_back (CheckMenuElem ((*v)->name()));
-               CheckMenuItem* item = dynamic_cast<CheckMenuItem*> (&items.back());
+               Gtk::CheckMenuItem* item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
                if (_vca->gain_control()->slaved_to ((*v)->gain_control())) {
                        item->set_active (true);
                }