Removed last usage of checkmark XPMs.

[ardour.git] / gtk2_ardour / crossfade_edit.cc

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index f244e337f15557ec84efcfc5bf35d27b1be17285..521c6b5c686f2c24ff0f6cb42c36680272646eac 100644 (file)
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -71,7 +71,7 @@ CrossfadeEditor::Half::Half ()
 }
 
 CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double mxy)
-       : ArdourDialog (_("crossfade editor")),
+       : ArdourDialog (_("ardour: x-fade edit")),
          cancel_button (_("Cancel")),
          ok_button (_("OK")),
          xfade (xf),
@@ -98,10 +98,8 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m
 {
        set_wmclass ("ardour_automationedit", "Ardour");
        set_name ("CrossfadeEditWindow");
-       set_title (_("ardour: x-fade edit"));
        set_position (Gtk::WIN_POS_MOUSE);
 
-       add (vpacker);
        add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
 
        RadioButtonGroup sel_but_group = select_in_button.get_group();
@@ -281,10 +279,8 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m
        curve_button_box.pack_start (*vpacker2, false, false, 12);
        curve_button_box.pack_start (fade_in_table, false, false, 12);
        
-       vpacker.set_border_width (12);
-       vpacker.set_spacing (5);
-       vpacker.pack_start (*canvas_frame, true, true);
-       vpacker.pack_start (curve_button_box, false, false);
+       get_vbox()->pack_start (*canvas_frame, true, true);
+       get_vbox()->pack_start (curve_button_box, false, false);
 
        /* button to allow hackers to check the actual curve values */
 
@@ -458,7 +454,7 @@ CrossfadeEditor::canvas_event (GdkEvent* event)
 
 CrossfadeEditor::Point::~Point()
 {
-       gtk_object_destroy (GTK_OBJECT(box));
+       delete box;
 }
 
 CrossfadeEditor::Point*
@@ -660,8 +656,8 @@ CrossfadeEditor::redraw ()
 
        fade[current].normative_curve.get_vector (0, 1.0, vec, npoints);
        
-       Gnome::Canvas::Points pts;
-       Gnome::Canvas::Points spts;
+       ArdourCanvas::Points pts;
+       ArdourCanvas::Points spts;
 
        while (pts.size() < npoints) {
                pts.push_back (Gnome::Art::Point (0,0));
@@ -729,7 +725,7 @@ CrossfadeEditor::redraw ()
        fade[current].line->property_points() = pts;
        fade[current].shading->property_points() = spts;
 
-       for (vector<Gnome::Canvas::WaveView*>::iterator i = fade[current].waves.begin(); i != fade[current].waves.end(); ++i) {
+       for (vector<ArdourCanvas::WaveView*>::iterator i = fade[current].waves.begin(); i != fade[current].waves.end(); ++i) {
                (*i)->property_gain_src() = &fade[current].gain_curve;
        }
 }