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

cpp11 branch merged back to to trunk

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7047 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-03-16 16:33:48 +00:00
parent 3f6132b553
commit 51687976c2
155 changed files with 1887 additions and 1038 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/CtrlLib/ArrayCtrl.cpp
View file

@ -201,7 +201,7 @@ void ArrayCtrl::CellInfo::Set(Ctrl *ctrl, bool owned, bool value)
ptr.Set1(cc);
}
ArrayCtrl::CellInfo::CellInfo(pick_ CellInfo& s)
ArrayCtrl::CellInfo::CellInfo(CellInfo rval_ s)
{
ptr = s.ptr;
const_cast<CellInfo&>(s).ptr.SetPtr(NULL);
@ -2298,15 +2298,15 @@ void ArrayCtrl::SortB(const Vector<int>& o)
Vector< Vector<CellInfo> > ncellinfo;
for(int i = 0; i < o.GetCount(); i++) {
int oi = o[i];
narray[i] = array[oi];
narray[i] = pick(array[oi]);
if(oi < cellinfo.GetCount())
ncellinfo.At(i) = cellinfo[oi];
ncellinfo.At(i) = pick(cellinfo[oi]);
if(oi < ln.GetCount())
nln.At(i) = ln[oi];
}
array = narray;
cellinfo = ncellinfo;
ln = nln;
array = pick(narray);
cellinfo = pick(ncellinfo);
ln = pick(nln);
Reline(0, 0);
if(hasctrls) {
for(int i = 0; i < array.GetCount(); i++)