From 39a55b921ece0756cdd1845e034a65633da07a64 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 22 Jun 2019 11:37:23 +1000 Subject: Feature [feature-requests:#1297] Update to use INDICATOR_ instead of INDIC_ as INDIC_ is also used for indicator styles. --- cocoa/ScintillaCocoa.mm | 2 +- cocoa/ScintillaView.mm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cocoa') diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 8271e7988..0f1a53e17 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -2274,7 +2274,7 @@ void ScintillaCocoa::CompositionStart() { */ void ScintillaCocoa::CompositionCommit() { pdoc->TentativeCommit(); - pdoc->DecorationSetCurrentIndicator(INDIC_IME); + pdoc->DecorationSetCurrentIndicator(INDICATOR_IME); pdoc->DecorationFillRange(0, 0, pdoc->Length()); } diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index 84dbff16a..fdf5c3374 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -624,7 +624,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) { posRangeCurrent.length = lengthInserted; mMarkedTextRange = mOwner.backend->CharactersFromPositions(posRangeCurrent); // Mark the just inserted text. Keep the marked range for later reset. - [mOwner setGeneralProperty: SCI_SETINDICATORCURRENT value: INDIC_IME]; + [mOwner setGeneralProperty: SCI_SETINDICATORCURRENT value: INDICATOR_IME]; [mOwner setGeneralProperty: SCI_INDICATORFILLRANGE parameter: posRangeCurrent.location value: posRangeCurrent.length]; @@ -1374,10 +1374,10 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) { * input composition, depending on language, keyboard etc. */ - (void) updateIndicatorIME { - [self setColorProperty: SCI_INDICSETFORE parameter: INDIC_IME fromHTML: @"#FF0000"]; + [self setColorProperty: SCI_INDICSETFORE parameter: INDICATOR_IME fromHTML: @"#FF0000"]; const bool drawInBackground = [self message: SCI_GETPHASESDRAW] != 0; - [self setGeneralProperty: SCI_INDICSETUNDER parameter: INDIC_IME value: drawInBackground]; - [self setGeneralProperty: SCI_INDICSETSTYLE parameter: INDIC_IME value: INDIC_PLAIN]; + [self setGeneralProperty: SCI_INDICSETUNDER parameter: INDICATOR_IME value: drawInBackground]; + [self setGeneralProperty: SCI_INDICSETSTYLE parameter: INDICATOR_IME value: INDIC_PLAIN]; [self setGeneralProperty: SCI_INDICSETALPHA parameter: INDIC_IME value: 100]; } -- cgit v1.2.3