diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-06-22 16:38:26 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-06-22 16:38:26 +1000 |
| commit | cac2920096062453ed19e5697146cd1b42ba088d (patch) | |
| tree | 4de045a6b3dc4bc82f40964607f52fd0949a3ab0 /src | |
| parent | d1be79eee1940dc99389deefd9d3ae766c3035e3 (diff) | |
| download | scintilla-mirror-cac2920096062453ed19e5697146cd1b42ba088d.tar.gz | |
Update IDocument for version 4. Drop IDocumentWithLineEnd interface to just have
IDocument but with all the methods from IDocumentWithLineEnd. This removes
version checking (for now). Use dvRelease4 ID.
Drop mask argument to StartStyling.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Document.cxx | 4 | ||||
| -rw-r--r-- | src/Document.h | 6 | ||||
| -rw-r--r-- | src/Editor.cxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index ac4322e1b..209060e5e 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -2033,8 +2033,8 @@ int Document::GetCharsOfClass(CharClassify::cc characterClass, unsigned char *bu return charClass.GetCharsOfClass(characterClass, buffer); } -void SCI_METHOD Document::StartStyling(Sci_Position position, char) { - endStyled = position; +void SCI_METHOD Document::StartStyling(Sci_Position position) { + endStyled = static_cast<Sci::Position>(position); } bool SCI_METHOD Document::SetStyleFor(Sci_Position length, char style) { diff --git a/src/Document.h b/src/Document.h index fd72c56c6..520755ae3 100644 --- a/src/Document.h +++ b/src/Document.h @@ -195,7 +195,7 @@ struct RegexError : public std::runtime_error { /** */ -class Document : PerLine, public IDocumentWithLineEnd, public ILoader { +class Document : PerLine, public IDocument, public ILoader { public: /** Used to pair watcher pointer with user data. */ @@ -286,7 +286,7 @@ public: virtual void RemoveLine(Sci::Line line); int SCI_METHOD Version() const { - return dvLineEnd; + return dvRelease4; } void SCI_METHOD SetErrorStatus(int status); @@ -412,7 +412,7 @@ public: void SetDefaultCharClasses(bool includeWordClass); void SetCharClasses(const unsigned char *chars, CharClassify::cc newCharClass); int GetCharsOfClass(CharClassify::cc characterClass, unsigned char *buffer) const; - void SCI_METHOD StartStyling(Sci_Position position, char mask); + void SCI_METHOD StartStyling(Sci_Position position); bool SCI_METHOD SetStyleFor(Sci_Position length, char style); bool SCI_METHOD SetStyles(Sci_Position length, const char *styles); Sci::Position GetEndStyled() const { return endStyled; } diff --git a/src/Editor.cxx b/src/Editor.cxx index 5a200e952..bf81bb8ea 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -2105,7 +2105,7 @@ void Editor::ClearAll() { void Editor::ClearDocumentStyle() { pdoc->decorations.DeleteLexerDecorations(); - pdoc->StartStyling(0, '\377'); + pdoc->StartStyling(0); pdoc->SetStyleFor(pdoc->Length(), 0); cs.ShowAll(); SetAnnotationHeights(0, pdoc->LinesTotal()); @@ -5549,7 +5549,7 @@ void Editor::AddStyledText(char *buffer, Sci::Position appendLength) { for (i = 0; i < textLength; i++) { text[i] = buffer[i*2+1]; } - pdoc->StartStyling(CurrentPosition(), static_cast<unsigned char>(0xff)); + pdoc->StartStyling(CurrentPosition()); pdoc->SetStyles(textLength, text.c_str()); SetEmptySelection(sel.MainCaret() + lengthInserted); } @@ -6390,7 +6390,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return pdoc->GetLineEndTypesActive(); case SCI_STARTSTYLING: - pdoc->StartStyling(static_cast<int>(wParam), static_cast<char>(lParam)); + pdoc->StartStyling(static_cast<int>(wParam)); break; case SCI_SETSTYLING: |