aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/ScintillaView.mm
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-06-22 11:37:23 +1000
committerNeil <nyamatongwe@gmail.com>2019-06-22 11:37:23 +1000
commitdd4e7804282ca821f1a82cbe9b0068cd675295ff (patch)
tree01d4c00a47a382e42136a7cdde7e0ccdbd36af48 /cocoa/ScintillaView.mm
parent08b7fa503f5cf22000e83769578939a3d03cc592 (diff)
downloadscintilla-mirror-dd4e7804282ca821f1a82cbe9b0068cd675295ff.tar.gz
Backport: Feature [feature-requests:#1297] Update to use INDICATOR_ instead of INDIC_ as
INDIC_ is also used for indicator styles. Backport of changeset 7594:190079cd334f.
Diffstat (limited to 'cocoa/ScintillaView.mm')
-rw-r--r--cocoa/ScintillaView.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index 224aac06c..0dcca1481 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -676,7 +676,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];
@@ -1498,10 +1498,10 @@ sourceOperationMaskForDraggingContext: (NSDraggingContext) context
*/
- (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];
}