diff options
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 2 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 2 | ||||
| -rw-r--r-- | src/Document.cxx | 4 | ||||
| -rw-r--r-- | src/Document.h | 4 | ||||
| -rw-r--r-- | src/Editor.cxx | 2 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 2 |
7 files changed, 10 insertions, 8 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index c8cf404ad..0eae8d356 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -2394,7 +2394,7 @@ void ScintillaCocoa::CompositionStart() void ScintillaCocoa::CompositionCommit() { pdoc->TentativeCommit(); - pdoc->decorations.SetCurrentIndicator(INDIC_IME); + pdoc->DecorationSetCurrentIndicator(INDIC_IME); pdoc->DecorationFillRange(0, 0, pdoc->Length()); } diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index a5c09c8e2..7b175d56b 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -2227,7 +2227,7 @@ void ScintillaGTK::DrawImeIndicator(int indicator, int len) { if (indicator < 8 || indicator > INDIC_MAX) { return; } - pdoc->decorations.SetCurrentIndicator(indicator); + pdoc->DecorationSetCurrentIndicator(indicator); for (size_t r=0; r<sel.Count(); r++) { int positionInsert = sel.Range(r).Start().Position(); pdoc->DecorationFillRange(positionInsert - len, 1, len); diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index 9059e6344..4b7d29440 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -451,7 +451,7 @@ void ScintillaEditBase::DrawImeIndicator(int indicator, int len) if (indicator < 8 || indicator > INDIC_MAX) { return; } - sqt->pdoc->decorations.SetCurrentIndicator(indicator); + sqt->pdoc->DecorationSetCurrentIndicator(indicator); for (size_t r=0; r< sqt-> sel.Count(); r++) { int positionInsert = sqt->sel.Range(r).Start().Position(); sqt->pdoc->DecorationFillRange(positionInsert - len, 1, len); diff --git a/src/Document.cxx b/src/Document.cxx index 93467274c..344534868 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -2221,6 +2221,10 @@ void Document::IncrementStyleClock() { styleClock = (styleClock + 1) % 0x100000; } +void SCI_METHOD Document::DecorationSetCurrentIndicator(int indicator) { + decorations.SetCurrentIndicator(indicator); +} + void SCI_METHOD Document::DecorationFillRange(Sci_Position position, int value, Sci_Position fillLength) { if (decorations.FillRange(position, value, fillLength)) { DocModification mh(SC_MOD_CHANGEINDICATOR | SC_PERFORMED_USER, diff --git a/src/Document.h b/src/Document.h index e7d182ec5..f6ab8b0d3 100644 --- a/src/Document.h +++ b/src/Document.h @@ -410,9 +410,7 @@ public: void LexerChanged(); int GetStyleClock() const { return styleClock; } void IncrementStyleClock(); - void SCI_METHOD DecorationSetCurrentIndicator(int indicator) { - decorations.SetCurrentIndicator(indicator); - } + void SCI_METHOD DecorationSetCurrentIndicator(int indicator); void SCI_METHOD DecorationFillRange(Sci_Position position, int value, Sci_Position fillLength); int SCI_METHOD SetLineState(Sci_Position line, int state); diff --git a/src/Editor.cxx b/src/Editor.cxx index 21c8fdf40..ea57b4d79 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -7354,7 +7354,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return (wParam <= INDIC_MAX) ? vs.indicators[wParam].outlineAlpha : 0; case SCI_SETINDICATORCURRENT: - pdoc->decorations.SetCurrentIndicator(static_cast<int>(wParam)); + pdoc->DecorationSetCurrentIndicator(static_cast<int>(wParam)); break; case SCI_GETINDICATORCURRENT: return pdoc->decorations.GetCurrentIndicator(); diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 525462f61..877ca5d88 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -906,7 +906,7 @@ void ScintillaWin::DrawImeIndicator(int indicator, int len) { if (indicator < 8 || indicator > INDIC_MAX) { return; } - pdoc->decorations.SetCurrentIndicator(indicator); + pdoc->DecorationSetCurrentIndicator(indicator); for (size_t r=0; r<sel.Count(); r++) { Sci::Position positionInsert = sel.Range(r).Start().Position(); pdoc->DecorationFillRange(positionInsert - len, 1, len); |