smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

merge resolution with master

Browse source
This commit is contained in:
Paul Davis 2013-05-02 20:21:54 -04:00
commit e2f0c5f91e
66 changed files with 255 additions and 4024 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/edit_note_dialog.cc
View file

@ -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;
}