Removed last usage of checkmark XPMs.

[ardour.git] / gtk2_ardour / region_gain_line.cc

diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index c3d81bbf8a8331cec37dd624865f5bd1d9c30016..dbd4a58fc08986a702013621777b6afacbb6db94 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -17,15 +17,12 @@
 using namespace std;
 using namespace ARDOUR;
 
-AudioRegionGainLine::AudioRegionGainLine (string name, Session& s, AudioRegionView& r, GtkCanvasItem* parent,
-                                         Curve& c, 
-                                         gint (*point_callback)(GtkCanvasItem*, GdkEvent*, gpointer),
-                                         gint (*line_callback)(GtkCanvasItem*, GdkEvent*, gpointer))
-       : AutomationLine (name, r.get_time_axis_view(), parent, c, point_callback, line_callback),
+AudioRegionGainLine::AudioRegionGainLine (string name, Session& s, AudioRegionView& r, ArdourCanvas::Group& parent, Curve& c)
+  : AutomationLine (name, r.get_time_axis_view(), parent, c),
          session (s),
          rv (r)
 {
-       gtk_canvas_item_raise_to_top (group);
+       group->raise_to_top ();
        set_verbose_cursor_uses_gain_mapping (true);
        terminal_points_can_slide = false;
 }
@@ -49,7 +46,7 @@ AudioRegionGainLine::start_drag (ControlPoint* cp, float fraction)
 {
        AutomationLine::start_drag(cp,fraction);
        if (!rv.region.envelope_active()) {
-               trackview.session().add_undo( bind( slot(rv.region, &AudioRegion::set_envelope_active), false) );
+               trackview.session().add_undo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), false) );
        }
 }
 
@@ -65,8 +62,8 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
        trackview.editor.current_session()->add_undo (get_memento());
 
        if (!rv.region.envelope_active()) {
-               trackview.session().add_undo( bind( slot(rv.region, &AudioRegion::set_envelope_active), false) );
-               trackview.session().add_redo( bind( slot(rv.region, &AudioRegion::set_envelope_active), true) );
+               trackview.session().add_undo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), false) );
+               trackview.session().add_redo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), true) );
                rv.region.set_envelope_active(true);
        }
 
@@ -81,7 +78,7 @@ void
 AudioRegionGainLine::end_drag (ControlPoint* cp) 
 {
        if (!rv.region.envelope_active()) {
-               trackview.session().add_redo( bind( slot(rv.region, &AudioRegion::set_envelope_active), true) );
+               trackview.session().add_redo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), true) );
                rv.region.set_envelope_active(true);
        }
        AutomationLine::end_drag(cp);