X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=6f47905f02082cce1dd6e830e821146caee6e74f;hb=c2c3f3177c6f3642f69f0266360c027e27568f1a;hp=b33132133ff6c0b3b438645f4074c391c43c97b4;hpb=d38e2213d79b1c8952c776a3b60f7709457edc0c;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index b33132133f..6f47905f02 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -53,8 +53,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
 	auto_play_item = 0;
 	ignore_state_request = false;
 
-	base_rect = gtk_canvas_item_new (GTK_CANVAS_GROUP(canvas_display),
-					 gtk_canvas_simplerect_get_type(),
+	base_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(canvas_display),
+					 gnome_canvas_simplerect_get_type(),
 					 "x1", 0.0,
 					 "y1", 0.0,
 					 "x2", 1000000.0,
@@ -70,7 +70,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
 			    (GtkSignalFunc) PublicEditor::canvas_automation_track_event,
 			    this);
 
-	hide_button.add (*(manage (new Pixmap (small_x_xpm))));
+	hide_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(small_x_xpm)))));
 
 	height_button.set_name ("TrackSizeButton");
 	auto_button.set_name ("TrackVisualButton");
@@ -157,7 +157,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
 	controls_base_unselected_name = X_("AutomationTrackControlsBase");
 	controls_ebox.set_name (controls_base_unselected_name);
 
-	controls_frame.set_shadow_type (GTK_SHADOW_ETCHED_OUT);
+	controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
 
 	XMLNode* xml_node = get_parent_with_state()->get_child_xml_node (_state_name);
 	set_state (*xml_node);
@@ -457,19 +457,19 @@ AutomationTimeAxisView::build_display_menu ()
 	
 	as_items.push_back (CheckMenuElem (_("off"), 
 					   bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
-	auto_off_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+	auto_off_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
 	as_items.push_back (CheckMenuElem (_("play"),
 					   bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
-	auto_play_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+	auto_play_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
 	as_items.push_back (CheckMenuElem (_("write"),
 					   bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
-	auto_write_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+	auto_write_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
 	as_items.push_back (CheckMenuElem (_("touch"),
 					   bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
-	auto_touch_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+	auto_touch_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
 	items.push_back (MenuElem (_("State"), *auto_state_menu));