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/editor_markers.cc | |
parent | 5cafb98983adf47c2daa4480e04984309355b7bf (diff) |
Fix ambiguous type CheckMenuItem that is also defined via windows.h
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
-rw-r--r-- | gtk2_ardour/editor_markers.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 3bca0ad935..6dee565287 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -858,14 +858,14 @@ Editor::build_marker_menu (Location* loc) items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::marker_menu_rename))); items.push_back (CheckMenuElem (_("Lock"))); - CheckMenuItem* lock_item = static_cast<CheckMenuItem*> (&items.back()); + Gtk::CheckMenuItem* lock_item = static_cast<Gtk::CheckMenuItem*> (&items.back()); if (loc->locked ()) { lock_item->set_active (); } lock_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_lock)); items.push_back (CheckMenuElem (_("Glue to Bars and Beats"))); - CheckMenuItem* glue_item = static_cast<CheckMenuItem*> (&items.back()); + Gtk::CheckMenuItem* glue_item = static_cast<Gtk::CheckMenuItem*> (&items.back()); if (loc->position_lock_style() == MusicTime) { glue_item->set_active (); } |