Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / edit_note_dialog.cc

diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc
index 2782122dbf0693f89c36ed296586280b1ffb05fb..3d72e080ed88ba2faf4dd231d34e93e73669f6aa 100644 (file)
--- a/gtk2_ardour/edit_note_dialog.cc
+++ b/gtk2_ardour/edit_note_dialog.cc
@@ -146,16 +146,13 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n)
        add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
        add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_ACCEPT);
        set_default_response (Gtk::RESPONSE_ACCEPT);
-
-       show_all ();
 }
 
-int
-EditNoteDialog::run ()
+void
+EditNoteDialog::done (int r)
 {
-       int const r = Dialog::run ();
        if (r != RESPONSE_ACCEPT) {
-               return r;
+                return;
        }
 
        /* These calls mean that if a value is entered using the keyboard
@@ -227,6 +224,4 @@ EditNoteDialog::run ()
        for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
                (*i)->set_selected ((*i)->selected()); // change color
        }
-
-       return r;
 }