ardour/livetrax
13
0
Fork 0
Code

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

Browse Source
This commit is contained in:
John Emmas 2016-06-01 14:26:23 +01:00
parent 17f1132545
commit f513878c8a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/mixer_strip.cc
View File

@ -2488,7 +2488,7 @@ MixerStrip::set_meter_type (MeterType t)
} }
void void
MixerStrip::vca_menu_toggle (CheckMenuItem* menuitem, uint32_t n) MixerStrip::vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n)
{ {
if (!_route) { if (!_route) {
return; return;
@ -2569,7 +2569,7 @@ MixerStrip::vca_button_release (GdkEventButton* ev)
for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) { for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
items.push_back (CheckMenuElem ((*v)->name())); 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)) { if (_route->slaved_to (*v)) {
item->set_active (true); item->set_active (true);
} }

4
gtk2_ardour/vca_master_strip.cc
View File

@ -363,7 +363,7 @@ VCAMasterStrip::solo_changed ()
} }
void 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); 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())); 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())) { if (_vca->gain_control()->slaved_to ((*v)->gain_control())) {
item->set_active (true); item->set_active (true);
} }