'Event' branch merged into trunk (Callback now deprecated)

git-svn-id: svn://ultimatepp.org/upp/trunk@10260 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-10-04 08:15:05 +00:00
parent 546596c6f7
commit 44037d6a0c
115 changed files with 756 additions and 828 deletions

View file

@ -120,7 +120,7 @@ void DiffDlg::Write()
}
}
Callback3<const String&, Vector<LineEdit::Highlight>&, const WString&> DiffDlg::WhenHighlight;
Event<const String&, Vector<LineEdit::Highlight>&, const WString&> DiffDlg::WhenHighlight;
static void sDoHighlight(Vector<LineEdit::Highlight>& hl, const WString& ln, const String *path)
{