github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/CtrlLib/ArrayCtrl.cpp
View file

@ -62,7 +62,7 @@ ArrayCtrl::Column& ArrayCtrl::Column::SetDisplay(const Display& d)
return *this;
}
ArrayCtrl::Column& ArrayCtrl::Column::Ctrls(Callback2<int, One<Ctrl>&> _factory)
ArrayCtrl::Column& ArrayCtrl::Column::Ctrls(Event<int, One<Ctrl>&> _factory)
{
factory = _factory;
arrayctrl->hasctrls = arrayctrl->headerctrls = true;
@ -72,15 +72,9 @@ ArrayCtrl::Column& ArrayCtrl::Column::Ctrls(Callback2<int, One<Ctrl>&> _factory)
return *this;
}
void ArrayCtrl::Column::Factory1(int, One<Ctrl>& x)
{
factory1(x);
}
ArrayCtrl::Column& ArrayCtrl::Column::Ctrls(Callback1<One<Ctrl>&> _factory)
{
factory1 = _factory;
return Ctrls(THISBACK(Factory1));
return Ctrls([=](int, One<Ctrl>& x) { _factory(x); });
}
void ArrayCtrl::Column::ClearCache() {
@ -3015,7 +3009,7 @@ ArrayCtrl::ArrayCtrl() {
header.WhenScroll = THISBACK(HeaderScroll);
sb.WhenScroll = THISBACK(Scroll);
header.Moving();
WhenAcceptRow = true;
WhenAcceptRow = [] { return true; };
WhenBar = THISBACK(StdBar);
SetFrame(ViewFrame());
oddpaper = evenpaper = SColorPaper;