diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-02 20:21:54 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-02 20:21:54 -0400 |
| commit | e2f0c5f91e2579c41d8efc9495b6ebac31a61ba3 (patch) | |
| tree | b8a15778c018df9c3615d7a1b0d6cc41dfef6626 /gtk2_ardour/edit_note_dialog.cc | |
| parent | c358e77e1e81a68fcb8b18cd71a31c38262b2af7 (diff) | |
| parent | 3973ce81b37a9ba6fcd2e7ff95ca730b0aa32252 (diff) | |
merge resolution with master
Diffstat (limited to 'gtk2_ardour/edit_note_dialog.cc')
| -rw-r--r-- | gtk2_ardour/edit_note_dialog.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc index 2782122dbf..3d72e080ed 100644 --- 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; } |