From 5802661b4019eca294a48a92c801a969ee17cde2 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 16 Apr 2017 17:28:41 +0000 Subject: [PATCH] ide: New HighlightOut::Put overload git-svn-id: svn://ultimatepp.org/upp/trunk@11010 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CodeEditor/HighlightOut.cpp | 9 +++++++-- uppsrc/CodeEditor/Syntax.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/uppsrc/CodeEditor/HighlightOut.cpp b/uppsrc/CodeEditor/HighlightOut.cpp index adc93f93d..a3641472e 100644 --- a/uppsrc/CodeEditor/HighlightOut.cpp +++ b/uppsrc/CodeEditor/HighlightOut.cpp @@ -75,13 +75,18 @@ void HighlightOutput::SetInk(int pos, int count, Color ink) v[pos++].ink = ink; } -void HighlightOutput::Put(int count, const HlStyle& ink, const HlStyle& paper) +void HighlightOutput::Put(int count, const HlStyle& ink, Color paper) { Set(pos, count, ink); - SetPaper(pos, count, paper.color); + SetPaper(pos, count, paper); pos += count; } +void HighlightOutput::Put(int count, const HlStyle& ink, const HlStyle& paper) +{ + Put(count, ink, paper.color); +} + const wchar *HighlightOutput::CString(const wchar *p) { Put(hl_style[INK_CONST_STRING]); diff --git a/uppsrc/CodeEditor/Syntax.h b/uppsrc/CodeEditor/Syntax.h index daacf4c01..634d235f9 100644 --- a/uppsrc/CodeEditor/Syntax.h +++ b/uppsrc/CodeEditor/Syntax.h @@ -78,6 +78,7 @@ public: void SetInk(int pos, int count, Color ink); void SetFlags(int count, word flags) { SetFlags(pos, count, flags); } void Put(int count, const HlStyle& ink) { Set(pos, count, ink); pos += count; } + void Put(int count, const HlStyle& ink, Color paper); void Put(int count, const HlStyle& ink, const HlStyle& paper); void Put(const HlStyle& ink) { Put(1, ink); } void Put(const HlStyle& ink, word flags) { Put(1, ink); v[pos - 1].flags = flags; }