diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-05-22 08:18:01 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-05-22 08:18:01 +1000 |
| commit | c8235ba0e0292f209a8233613669e2cff8de80da (patch) | |
| tree | 117df121f92601300eeb2e9a047860384eb17d79 /win32/ScintillaWin.cxx | |
| parent | 7f8a8cfb32aecb70fe10ef26fe096f4092f7e673 (diff) | |
| download | scintilla-mirror-c8235ba0e0292f209a8233613669e2cff8de80da.tar.gz | |
Rename ColourAlpha to ColourRGBA to avoid clashes when a ColourAlpha typedef
will be published in externally visible header.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 810682df4..c6782721f 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -589,10 +589,10 @@ void ScintillaWin::Init() { HMODULE user32 = ::GetModuleHandleW(L"user32.dll"); SetCoalescableTimerFn = DLLFunction<SetCoalescableTimerSig>(user32, "SetCoalescableTimer"); - vs.indicators[SC_INDICATOR_UNKNOWN] = Indicator(INDIC_HIDDEN, ColourAlpha(0, 0, 0xff)); - vs.indicators[SC_INDICATOR_INPUT] = Indicator(INDIC_DOTS, ColourAlpha(0, 0, 0xff)); - vs.indicators[SC_INDICATOR_CONVERTED] = Indicator(INDIC_COMPOSITIONTHICK, ColourAlpha(0, 0, 0xff)); - vs.indicators[SC_INDICATOR_TARGET] = Indicator(INDIC_STRAIGHTBOX, ColourAlpha(0, 0, 0xff)); + vs.indicators[SC_INDICATOR_UNKNOWN] = Indicator(INDIC_HIDDEN, ColourRGBA(0, 0, 0xff)); + vs.indicators[SC_INDICATOR_INPUT] = Indicator(INDIC_DOTS, ColourRGBA(0, 0, 0xff)); + vs.indicators[SC_INDICATOR_CONVERTED] = Indicator(INDIC_COMPOSITIONTHICK, ColourRGBA(0, 0, 0xff)); + vs.indicators[SC_INDICATOR_TARGET] = Indicator(INDIC_STRAIGHTBOX, ColourRGBA(0, 0, 0xff)); } void ScintillaWin::Finalise() { @@ -2183,7 +2183,7 @@ void ScintillaWin::UpdateBaseElements() { }; bool changed = false; for (const ElementToIndex &ei : eti) { - changed = vs.SetElementBase(ei.element, ColourAlpha::FromRGB(::GetSysColor(ei.nIndex))) || changed; + changed = vs.SetElementBase(ei.element, ColourRGBA::FromRGB(::GetSysColor(ei.nIndex))) || changed; } if (changed) { Redraw(); |