diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 15:32:31 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 15:32:31 -0400 |
commit | c08b336292cd66e066eae23bc6272dce42ae28c2 (patch) | |
tree | 4bfba2e57b84dc61aa657a0df4b6624e2f9da643 /gtk2_ardour/automation_time_axis.cc | |
parent | 5cafb98983adf47c2daa4480e04984309355b7bf (diff) |
Fix ambiguous type CheckMenuItem that is also defined via windows.h
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
-rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 848298c8b8..1621697335 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -496,22 +496,22 @@ AutomationTimeAxisView::build_display_menu () as_items.push_back (CheckMenuElem (S_("Automation|Manual"), sigc::bind ( sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) ARDOUR::Off))); - auto_off_item = dynamic_cast<CheckMenuItem*>(&as_items.back()); + auto_off_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back()); as_items.push_back (CheckMenuElem (_("Play"), sigc::bind ( sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play))); - auto_play_item = dynamic_cast<CheckMenuItem*>(&as_items.back()); + auto_play_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back()); as_items.push_back (CheckMenuElem (_("Write"), sigc::bind ( sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write))); - auto_write_item = dynamic_cast<CheckMenuItem*>(&as_items.back()); + auto_write_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back()); as_items.push_back (CheckMenuElem (_("Touch"), sigc::bind ( sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch))); - auto_touch_item = dynamic_cast<CheckMenuItem*>(&as_items.back()); + auto_touch_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back()); items.push_back (MenuElem (_("State"), *auto_state_menu)); @@ -531,13 +531,13 @@ AutomationTimeAxisView::build_display_menu () am_items.push_back (RadioMenuElem (group, _("Discrete"), sigc::bind ( sigc::mem_fun(*this, &AutomationTimeAxisView::set_interpolation), AutomationList::Discrete))); - mode_discrete_item = dynamic_cast<CheckMenuItem*>(&am_items.back()); + mode_discrete_item = dynamic_cast<Gtk::CheckMenuItem*>(&am_items.back()); mode_discrete_item->set_active (s == AutomationList::Discrete); am_items.push_back (RadioMenuElem (group, _("Linear"), sigc::bind ( sigc::mem_fun(*this, &AutomationTimeAxisView::set_interpolation), AutomationList::Linear))); - mode_line_item = dynamic_cast<CheckMenuItem*>(&am_items.back()); + mode_line_item = dynamic_cast<Gtk::CheckMenuItem*>(&am_items.back()); mode_line_item->set_active (s == AutomationList::Linear); items.push_back (MenuElem (_("Mode"), *auto_mode_menu)); |