Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

[ardour.git] / gtk2_ardour / editor_rulers.cc

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 27a13a94b760a8e29037d9546526fcb3083a8a77..9f6e978dce5322380140cb664b8219d963919bef 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -384,11 +384,11 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
                ruler_items.push_back (MenuElem (_("Timeline height")));
                static_cast<MenuItem*>(&ruler_items.back())->set_sensitive(false);
                ruler_items.push_back (CheckMenuElem (_("Large"),  sigc::bind ( sigc::mem_fun(*this, &Editor::set_video_timeline_height), 6)));
-               if (videotl_bar_height == 6) { static_cast<CheckMenuItem*>(&ruler_items.back())->set_active(true);}
+               if (videotl_bar_height == 6) { static_cast<Gtk::CheckMenuItem*>(&ruler_items.back())->set_active(true);}
                ruler_items.push_back (CheckMenuElem (_("Normal"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_video_timeline_height), 4)));
-               if (videotl_bar_height == 4) { static_cast<CheckMenuItem*>(&ruler_items.back())->set_active(true);}
+               if (videotl_bar_height == 4) { static_cast<Gtk::CheckMenuItem*>(&ruler_items.back())->set_active(true);}
                ruler_items.push_back (CheckMenuElem (_("Small"),  sigc::bind ( sigc::mem_fun(*this, &Editor::set_video_timeline_height), 3)));
-               if (videotl_bar_height == 3) { static_cast<CheckMenuItem*>(&ruler_items.back())->set_active(true);}
+               if (videotl_bar_height == 3) { static_cast<Gtk::CheckMenuItem*>(&ruler_items.back())->set_active(true);}
                ruler_items.push_back (SeparatorElem ());
 
                ruler_items.push_back (MenuElem (_("Align Video Track")));
@@ -396,7 +396,7 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
 
                ruler_items.push_back (CheckMenuElem (_("Lock")));
                {
-               CheckMenuItem* vtl_lock = static_cast<CheckMenuItem*>(&ruler_items.back());
+               Gtk::CheckMenuItem* vtl_lock = static_cast<Gtk::CheckMenuItem*>(&ruler_items.back());
                vtl_lock->set_active(is_video_timeline_locked());
                vtl_lock->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_video_timeline_locked));
                }