diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2016-06-01 14:26:23 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2016-06-01 14:30:29 +0100 |
| commit | f513878c8a54bdbed0d2657ac904f51590d4556e (patch) | |
| tree | 20e31ae5881e5d7d7405d62d9b8bfb0c7a7581fc /gtk2_ardour | |
| parent | 17f1132545bba7dd39f8e47151977ff5cbb790c4 (diff) | |
MSVC itself defines a class called CheckMenuItem - so make sure we know to use the one from Gtk
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/vca_master_strip.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index a4c65475c5..439a0ee5a5 100644 --- 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 d2e6523f52..087e562197 100644 --- 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); } |