fix lack of canvas.h

[ardour.git] / gtk2_ardour / editor_rulers.cc

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 275019e6eb98d009696c3ada757c0ed5f05dd752..b0edcedd3882d0e96787cc35983baefc02f0c704 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -133,7 +133,7 @@ Editor::ruler_button_press (GdkEventButton* ev)
        else if (minsec_ruler->is_realized() && ev->window == minsec_ruler->get_window()->gobj()) grab_widget = minsec_ruler;
 
        if (grab_widget) {
-               Gtk::Main::grab_add (*grab_widget);
+               grab_widget->add_modal_grab ();
                ruler_grabbed_widget = grab_widget;
        }
 
@@ -189,7 +189,7 @@ Editor::ruler_button_release (GdkEventButton* ev)
 
 
        if (ruler_grabbed_widget) {
-               Gtk::Main::grab_remove (*ruler_grabbed_widget);
+               ruler_grabbed_widget->remove_modal_grab();
                ruler_grabbed_widget = 0;
        }
 
@@ -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_gnome_canvas), x, y, &wcx, &wcy);
-       gnome_canvas_w2c_d (GNOME_CANVAS(track_gnome_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);
 
@@ -605,51 +605,50 @@ Editor::update_ruler_visibility ()
        if (ruler_shown[ruler_time_meter]) {
                lab_children.push_back (Element(meter_label, PACK_SHRINK, PACK_START));
 
-               gtk_object_getv (GTK_OBJECT(meter_group), 1, args) ;
-               old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
+               gtk_object_get (GTK_OBJECT(meter_group), "y", &old_unit_pos);
                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]) {
                lab_children.push_back (Element(tempo_label, PACK_SHRINK, PACK_START));
-               gtk_object_getv (GTK_OBJECT(tempo_group), 1, args) ;
-               old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
+               gtk_object_get (GTK_OBJECT(tempo_group), "y", &old_unit_pos);
                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]) {
                lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START));
                gtk_object_getv (GTK_OBJECT(marker_group), 1, args) ;
                old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
+               gtk_object_get (GTK_OBJECT(marker_group), "y", &old_unit_pos);
                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,31 +656,30 @@ 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]) {
                lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START));
-               gtk_object_getv (GTK_OBJECT(transport_marker_group), 1, args) ;
-               old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
+               gtk_object_get (GTK_OBJECT(transport_marker_group), "y", &old_unit_pos);
                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));