mostly editor.cc & editor_mouse.cc for Gdk::Cursor, Gnome::Canvas::Item

git-svn-id: svn://localhost/trunk/ardour2@73 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 17 insertions, 17 deletions

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 1a4ba1a579..f8d73c6098 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -225,8 +225,8 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev)
 	time_canvas_event_box.get_window()->get_pointer (x, y, state);
 
 	
-	gnome_canvas_window_to_world (GNOME_CANVAS(track_canvas), x, y, &wcx, &wcy);
-	gnome_canvas_w2c_d (GNOME_CANVAS(track_canvas), wcx, wcy, &cx, &cy);
+	track_canvas.c2w (x, y, wcx, wcy);
+	track_canvas.w2c (wcx, wcy, cx, cy);
 	
 	jack_nframes_t where = leftmost_frame + pixel_to_frame (x);
 
@@ -608,16 +608,16 @@ Editor::update_ruler_visibility ()
 		gtk_object_getv (GTK_OBJECT(meter_group), 1, args) ;
 		old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
 		if (tbpos != old_unit_pos) {
-			gnome_canvas_item_move (meter_group, 0.0, tbpos - old_unit_pos) ;
+			meter_group->move ( 0.0, tbpos - old_unit_pos);
 		}
 
 		//gnome_canvas_item_set (meter_group, "y", tbpos, NULL);
-		gnome_canvas_item_show (meter_group);
+		meter_group->show();
 		tbpos += timebar_height;
 		visible_timebars++;
 	}
 	else {
-		gnome_canvas_item_hide (meter_group);
+		meter_group->hide();
 	}
 	
 	if (ruler_shown[ruler_time_tempo]) {
@@ -625,15 +625,15 @@ Editor::update_ruler_visibility ()
 		gtk_object_getv (GTK_OBJECT(tempo_group), 1, args) ;
 		old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
 		if (tbpos != old_unit_pos) {
-			gnome_canvas_item_move (tempo_group, 0.0, tbpos - old_unit_pos) ;
+			tempo_group->move(0.0, tbpos - old_unit_pos);
 		}
 		//gnome_canvas_item_set (tempo_group, "y", tbpos, NULL);
-		gnome_canvas_item_show (tempo_group);
+		tempo_group->show();
 		tbpos += timebar_height;
 		visible_timebars++;
 	}
 	else {
-		gnome_canvas_item_hide (tempo_group);
+		tempo_group->hide();
 	}
 	
 	if (ruler_shown[ruler_time_marker]) {
@@ -641,15 +641,15 @@ Editor::update_ruler_visibility ()
 		gtk_object_getv (GTK_OBJECT(marker_group), 1, args) ;
 		old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
 		if (tbpos != old_unit_pos) {
-			gnome_canvas_item_move (marker_group, 0.0, tbpos - old_unit_pos) ;
+			marker_group->move ( 0.0, tbpos - old_unit_pos);
 		}
 		//gnome_canvas_item_set (marker_group, "y", tbpos, NULL);
-		gnome_canvas_item_show (marker_group);
+		marker_group->show();
 		tbpos += timebar_height;
 		visible_timebars++;
 	}
 	else {
-		gnome_canvas_item_hide (marker_group);
+		marker_group->hide();
 	}
 	
 	if (ruler_shown[ruler_time_range_marker]) {
@@ -657,15 +657,15 @@ Editor::update_ruler_visibility ()
 		gtk_object_getv (GTK_OBJECT(range_marker_group), 1, args) ;
 		old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
 		if (tbpos != old_unit_pos) {
-			gnome_canvas_item_move (range_marker_group, 0.0, tbpos - old_unit_pos) ;
+			range_marker_group->move (0.0, tbpos - old_unit_pos);
 		}
 		//gnome_canvas_item_set (marker_group, "y", tbpos, NULL);
-		gnome_canvas_item_show (range_marker_group);
+		range_marker_group->show();
 		tbpos += timebar_height;
 		visible_timebars++;
 	}
 	else {
-		gnome_canvas_item_hide (range_marker_group);
+		range_marker_group->hide();
 	}
 
 	if (ruler_shown[ruler_time_transport_marker]) {
@@ -673,15 +673,15 @@ Editor::update_ruler_visibility ()
 		gtk_object_getv (GTK_OBJECT(transport_marker_group), 1, args) ;
 		old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
 		if (tbpos != old_unit_pos) {
-			gnome_canvas_item_move (transport_marker_group, 0.0, tbpos - old_unit_pos) ;
+			transport_marker_group->move ( 0.0, tbpos - old_unit_pos);
 		}
 		//gnome_canvas_item_set (marker_group, "y", tbpos, NULL);
-		gnome_canvas_item_show (transport_marker_group);
+		transport_marker_group->show();
 		tbpos += timebar_height;
 		visible_timebars++;
 	}
 	else {
-		gnome_canvas_item_hide (transport_marker_group);
+		transport_marker_group->hide();
 	}
 	
 	time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars));