github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -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
commit 51687976c2
155 changed files with 1885 additions and 1036 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/CodeEditor/CodeEditor.h
View file

@ -70,7 +70,6 @@ private:
Vector<LnInfo> li;
LineInfoRem li_removed;
int sy;
CodeEditor *editor;
int ptrline[2];
Image ptrimg[2];
@ -114,7 +113,7 @@ public:
LineInfo GetLineInfo() const;
void SetLineInfo(const LineInfo& li, int total);
LineInfoRem & GetLineInfoRem() { return li_removed; }
void SetLineInfoRem(pick_ LineInfoRem& li) { li_removed = li; }
void SetLineInfoRem(LineInfoRem pick_ li) { li_removed = pick(li); }
void SetAnnotation(int line, const Image& img, const String& ann);
String GetAnnotation(int line) const;
@ -492,7 +491,7 @@ public:
LineInfo GetLineInfo() const { return bar.GetLineInfo(); }
void SetLineInfo(const LineInfo& lf);
LineInfoRem GetLineInfoRem() { return LineInfoRem(bar.GetLineInfoRem(), 0); }
void SetLineInfoRem(pick_ LineInfoRem& lf) { bar.SetLineInfoRem(LineInfoRem(lf, 0)); }
void SetLineInfoRem(LineInfoRem pick_ lf) { bar.SetLineInfoRem(LineInfoRem(lf, 0)); }
double GetStatEditTime() const { return stat_edit_time; }
void Renumber() { bar.Renumber(GetLineCount()); }
void ClearBreakpoints() { bar.ClearBreakpoints(); }