Skip to content

+upd: Scintilla v5.6.7 #6014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RaiKoHoff merged 2 commits into from
Oct 3, 2026
Merged

+upd: Scintilla v5.6.7 #6014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2cb961
+upd: Scintilla v5.6.7
RaiKoHoff Oct 3, 2026
b3c7c87
Merge branch 'rizonesoft:master' into dev_master
RaiKoHoff Oct 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 78 additions & 78 deletions scintilla/call/ScintillaCall.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,12 +275,12 @@ void ScintillaCall::SetTabDrawMode(Scintilla::TabDrawMode tabDrawMode) {
Call(Message::SetTabDrawMode, static_cast<uintptr_t>(tabDrawMode));
}

Position ScintillaCall::PositionFromPoint(int x, int y) {
return Call(Message::PositionFromPoint, x, y);
Position ScintillaCall::PositionFromPoint(Pixels x, Pixels y) {
return Call(Message::PositionFromPoint, static_cast<uintptr_t>(x), static_cast<intptr_t>(y));
}

Position ScintillaCall::PositionFromPointClose(int x, int y) {
return Call(Message::PositionFromPointClose, x, y);
Position ScintillaCall::PositionFromPointClose(Pixels x, Pixels y) {
return Call(Message::PositionFromPointClose, static_cast<uintptr_t>(x), static_cast<intptr_t>(y));
}

void ScintillaCall::GotoLine(Line line) {
Expand Down Expand Up @@ -343,12 +343,12 @@ int ScintillaCall::TabWidth() {
return static_cast<int>(Call(Message::GetTabWidth));
}

void ScintillaCall::SetTabMinimumWidth(int pixels) {
Call(Message::SetTabMinimumWidth, pixels);
void ScintillaCall::SetTabMinimumWidth(Pixels pixels) {
Call(Message::SetTabMinimumWidth, static_cast<uintptr_t>(pixels));
}

int ScintillaCall::TabMinimumWidth() {
return static_cast<int>(Call(Message::GetTabMinimumWidth));
Pixels ScintillaCall::TabMinimumWidth() {
return static_cast<Scintilla::Pixels>(Call(Message::GetTabMinimumWidth));
}

void ScintillaCall::ClearTabStops(Line line) {
Expand Down Expand Up @@ -415,8 +415,8 @@ void ScintillaCall::MarkerSetBackSelectedTranslucent(int markerNumber, ColourAlp
Call(Message::MarkerSetBackSelectedTranslucent, markerNumber, back);
}

void ScintillaCall::MarkerSetStrokeWidth(int markerNumber, int hundredths) {
Call(Message::MarkerSetStrokeWidth, markerNumber, hundredths);
void ScintillaCall::MarkerSetStrokeWidth(int markerNumber, Pixels hundredths) {
Call(Message::MarkerSetStrokeWidth, markerNumber, static_cast<intptr_t>(hundredths));
}

void ScintillaCall::MarkerEnableHighlight(bool enabled) {
Expand Down Expand Up @@ -475,12 +475,12 @@ MarginType ScintillaCall::MarginTypeN(int margin) {
return static_cast<Scintilla::MarginType>(Call(Message::GetMarginTypeN, margin));
}

void ScintillaCall::SetMarginWidthN(int margin, int pixelWidth) {
Call(Message::SetMarginWidthN, margin, pixelWidth);
void ScintillaCall::SetMarginWidthN(int margin, Pixels pixelWidth) {
Call(Message::SetMarginWidthN, margin, static_cast<intptr_t>(pixelWidth));
}

int ScintillaCall::MarginWidthN(int margin) {
return static_cast<int>(Call(Message::GetMarginWidthN, margin));
Pixels ScintillaCall::MarginWidthN(int margin) {
return static_cast<Scintilla::Pixels>(Call(Message::GetMarginWidthN, margin));
}

void ScintillaCall::SetMarginMaskN(int margin, int mask) {
Expand Down Expand Up @@ -931,12 +931,12 @@ IndicFlag ScintillaCall::IndicGetFlags(int indicator) {
return static_cast<Scintilla::IndicFlag>(Call(Message::IndicGetFlags, indicator));
}

void ScintillaCall::IndicSetStrokeWidth(int indicator, int hundredths) {
Call(Message::IndicSetStrokeWidth, indicator, hundredths);
void ScintillaCall::IndicSetStrokeWidth(int indicator, Pixels hundredths) {
Call(Message::IndicSetStrokeWidth, indicator, static_cast<intptr_t>(hundredths));
}

int ScintillaCall::IndicGetStrokeWidth(int indicator) {
return static_cast<int>(Call(Message::IndicGetStrokeWidth, indicator));
Pixels ScintillaCall::IndicGetStrokeWidth(int indicator) {
return static_cast<Scintilla::Pixels>(Call(Message::IndicGetStrokeWidth, indicator));
}

void ScintillaCall::SetWhitespaceFore(bool useSetting, Colour fore) {
Expand All @@ -947,12 +947,12 @@ void ScintillaCall::SetWhitespaceBack(bool useSetting, Colour back) {
Call(Message::SetWhitespaceBack, useSetting, back);
}

void ScintillaCall::SetWhitespaceSize(int size) {
Call(Message::SetWhitespaceSize, size);
void ScintillaCall::SetWhitespaceSize(Pixels size) {
Call(Message::SetWhitespaceSize, static_cast<uintptr_t>(size));
}

int ScintillaCall::WhitespaceSize() {
return static_cast<int>(Call(Message::GetWhitespaceSize));
Pixels ScintillaCall::WhitespaceSize() {
return static_cast<Scintilla::Pixels>(Call(Message::GetWhitespaceSize));
}

void ScintillaCall::SetLineState(Line line, int state) {
Expand Down Expand Up @@ -983,12 +983,12 @@ void ScintillaCall::SetCaretLineBack(Colour back) {
Call(Message::SetCaretLineBack, back);
}

int ScintillaCall::CaretLineFrame() {
return static_cast<int>(Call(Message::GetCaretLineFrame));
Pixels ScintillaCall::CaretLineFrame() {
return static_cast<Scintilla::Pixels>(Call(Message::GetCaretLineFrame));
}

void ScintillaCall::SetCaretLineFrame(int width) {
Call(Message::SetCaretLineFrame, width);
void ScintillaCall::SetCaretLineFrame(Pixels width) {
Call(Message::SetCaretLineFrame, static_cast<uintptr_t>(width));
}

void ScintillaCall::StyleSetChangeable(int style, bool changeable) {
Expand Down Expand Up @@ -1319,20 +1319,20 @@ void ScintillaCall::AllocateLines(Line lines) {
Call(Message::AllocateLines, lines);
}

void ScintillaCall::SetMarginLeft(int pixelWidth) {
Call(Message::SetMarginLeft, 0, pixelWidth);
void ScintillaCall::SetMarginLeft(Pixels pixelWidth) {
Call(Message::SetMarginLeft, 0, static_cast<intptr_t>(pixelWidth));
}

int ScintillaCall::MarginLeft() {
return static_cast<int>(Call(Message::GetMarginLeft));
Pixels ScintillaCall::MarginLeft() {
return static_cast<Scintilla::Pixels>(Call(Message::GetMarginLeft));
}

void ScintillaCall::SetMarginRight(int pixelWidth) {
Call(Message::SetMarginRight, 0, pixelWidth);
void ScintillaCall::SetMarginRight(Pixels pixelWidth) {
Call(Message::SetMarginRight, 0, static_cast<intptr_t>(pixelWidth));
}

int ScintillaCall::MarginRight() {
return static_cast<int>(Call(Message::GetMarginRight));
Pixels ScintillaCall::MarginRight() {
return static_cast<Scintilla::Pixels>(Call(Message::GetMarginRight));
}

bool ScintillaCall::Modify() {
Expand Down Expand Up @@ -1367,12 +1367,12 @@ bool ScintillaCall::SelectionHidden() {
return Call(Message::GetSelectionHidden);
}

int ScintillaCall::PointXFromPosition(Position pos) {
return static_cast<int>(Call(Message::PointXFromPosition, 0, pos));
Pixels ScintillaCall::PointXFromPosition(Position pos) {
return static_cast<Scintilla::Pixels>(Call(Message::PointXFromPosition, 0, pos));
}

int ScintillaCall::PointYFromPosition(Position pos) {
return static_cast<int>(Call(Message::PointYFromPosition, 0, pos));
Pixels ScintillaCall::PointYFromPosition(Position pos) {
return static_cast<Scintilla::Pixels>(Call(Message::PointYFromPosition, 0, pos));
}

Line ScintillaCall::LineFromPosition(Position pos) {
Expand Down Expand Up @@ -1479,12 +1479,12 @@ bool ScintillaCall::Overtype() {
return Call(Message::GetOvertype);
}

void ScintillaCall::SetCaretWidth(int pixelWidth) {
Call(Message::SetCaretWidth, pixelWidth);
void ScintillaCall::SetCaretWidth(Pixels pixelWidth) {
Call(Message::SetCaretWidth, static_cast<uintptr_t>(pixelWidth));
}

int ScintillaCall::CaretWidth() {
return static_cast<int>(Call(Message::GetCaretWidth));
Pixels ScintillaCall::CaretWidth() {
return static_cast<Scintilla::Pixels>(Call(Message::GetCaretWidth));
}

void ScintillaCall::SetTargetStart(Position start) {
Expand Down Expand Up @@ -1599,8 +1599,8 @@ void ScintillaCall::CallTipSetForeHlt(Colour fore) {
Call(Message::CallTipSetForeHlt, fore);
}

void ScintillaCall::CallTipUseStyle(int tabSize) {
Call(Message::CallTipUseStyle, tabSize);
void ScintillaCall::CallTipUseStyle(Pixels tabSize) {
Call(Message::CallTipUseStyle, static_cast<uintptr_t>(tabSize));
}

void ScintillaCall::CallTipSetPosition(bool above) {
Expand Down Expand Up @@ -1791,12 +1791,12 @@ WrapVisualLocation ScintillaCall::WrapVisualFlagsLocation() {
return static_cast<Scintilla::WrapVisualLocation>(Call(Message::GetWrapVisualFlagsLocation));
}

void ScintillaCall::SetWrapStartIndent(int indent) {
Call(Message::SetWrapStartIndent, indent);
void ScintillaCall::SetWrapStartIndent(Pixels indent) {
Call(Message::SetWrapStartIndent, static_cast<uintptr_t>(indent));
}

int ScintillaCall::WrapStartIndent() {
return static_cast<int>(Call(Message::GetWrapStartIndent));
Pixels ScintillaCall::WrapStartIndent() {
return static_cast<Scintilla::Pixels>(Call(Message::GetWrapStartIndent));
}

void ScintillaCall::SetWrapIndentMode(Scintilla::WrapIndentMode wrapIndentMode) {
Expand All @@ -1815,12 +1815,12 @@ LineCache ScintillaCall::LayoutCache() {
return static_cast<Scintilla::LineCache>(Call(Message::GetLayoutCache));
}

void ScintillaCall::SetScrollWidth(int pixelWidth) {
Call(Message::SetScrollWidth, pixelWidth);
void ScintillaCall::SetScrollWidth(Pixels pixelWidth) {
Call(Message::SetScrollWidth, static_cast<uintptr_t>(pixelWidth));
}

int ScintillaCall::ScrollWidth() {
return static_cast<int>(Call(Message::GetScrollWidth));
Pixels ScintillaCall::ScrollWidth() {
return static_cast<Scintilla::Pixels>(Call(Message::GetScrollWidth));
}

void ScintillaCall::SetScrollWidthTracking(bool tracking) {
Expand All @@ -1831,8 +1831,8 @@ bool ScintillaCall::ScrollWidthTracking() {
return Call(Message::GetScrollWidthTracking);
}

int ScintillaCall::TextWidth(int style, const char *text) {
return static_cast<int>(CallString(Message::TextWidth, style, text));
Pixels ScintillaCall::TextWidth(int style, const char *text) {
return static_cast<Scintilla::Pixels>(CallString(Message::TextWidth, style, text));
}

void ScintillaCall::SetEndAtLastLine(bool endAtLastLine) {
Expand All @@ -1843,8 +1843,8 @@ bool ScintillaCall::EndAtLastLine() {
return Call(Message::GetEndAtLastLine);
}

int ScintillaCall::TextHeight(Line line) {
return static_cast<int>(Call(Message::TextHeight, line));
Pixels ScintillaCall::TextHeight(Line line) {
return static_cast<Scintilla::Pixels>(Call(Message::TextHeight, line));
}

void ScintillaCall::SetVScrollBar(bool visible) {
Expand Down Expand Up @@ -1899,8 +1899,8 @@ void ScintillaCall::LinesJoin() {
Call(Message::LinesJoin);
}

void ScintillaCall::LinesSplit(int pixelWidth) {
Call(Message::LinesSplit, pixelWidth);
void ScintillaCall::LinesSplit(Pixels pixelWidth) {
Call(Message::LinesSplit, static_cast<uintptr_t>(pixelWidth));
}

void ScintillaCall::SetFoldMarginColour(bool useSetting, Colour back) {
Expand Down Expand Up @@ -2387,12 +2387,12 @@ void ScintillaCall::DelLineRight() {
Call(Message::DelLineRight);
}

void ScintillaCall::SetXOffset(int xOffset) {
Call(Message::SetXOffset, xOffset);
void ScintillaCall::SetXOffset(Pixels xOffset) {
Call(Message::SetXOffset, static_cast<uintptr_t>(xOffset));
}

int ScintillaCall::XOffset() {
return static_cast<int>(Call(Message::GetXOffset));
Pixels ScintillaCall::XOffset() {
return static_cast<Scintilla::Pixels>(Call(Message::GetXOffset));
}

void ScintillaCall::ChooseCaretX() {
Expand All @@ -2403,8 +2403,8 @@ void ScintillaCall::GrabFocus() {
Call(Message::GrabFocus);
}

void ScintillaCall::SetXCaretPolicy(Scintilla::CaretPolicy caretPolicy, int caretSlop) {
Call(Message::SetXCaretPolicy, static_cast<uintptr_t>(caretPolicy), caretSlop);
void ScintillaCall::SetXCaretPolicy(Scintilla::CaretPolicy caretPolicy, Pixels caretSlop) {
Call(Message::SetXCaretPolicy, static_cast<uintptr_t>(caretPolicy), static_cast<intptr_t>(caretSlop));
}

void ScintillaCall::SetYCaretPolicy(Scintilla::CaretPolicy caretPolicy, int caretSlop) {
Expand Down Expand Up @@ -2827,20 +2827,20 @@ Alpha ScintillaCall::IndicGetOutlineAlpha(int indicator) {
return static_cast<Scintilla::Alpha>(Call(Message::IndicGetOutlineAlpha, indicator));
}

void ScintillaCall::SetExtraAscent(int extraAscent) {
Call(Message::SetExtraAscent, extraAscent);
void ScintillaCall::SetExtraAscent(Pixels extraAscent) {
Call(Message::SetExtraAscent, static_cast<uintptr_t>(extraAscent));
}

int ScintillaCall::ExtraAscent() {
return static_cast<int>(Call(Message::GetExtraAscent));
Pixels ScintillaCall::ExtraAscent() {
return static_cast<Scintilla::Pixels>(Call(Message::GetExtraAscent));
}

void ScintillaCall::SetExtraDescent(int extraDescent) {
Call(Message::SetExtraDescent, extraDescent);
void ScintillaCall::SetExtraDescent(Pixels extraDescent) {
Call(Message::SetExtraDescent, static_cast<uintptr_t>(extraDescent));
}

int ScintillaCall::ExtraDescent() {
return static_cast<int>(Call(Message::GetExtraDescent));
Pixels ScintillaCall::ExtraDescent() {
return static_cast<Scintilla::Pixels>(Call(Message::GetExtraDescent));
}

MarkerSymbol ScintillaCall::MarkerSymbolDefined(int markerNumber) {
Expand Down Expand Up @@ -2967,12 +2967,12 @@ void ScintillaCall::AddUndoAction(int token, Scintilla::UndoFlags flags) {
Call(Message::AddUndoAction, token, static_cast<intptr_t>(flags));
}

Position ScintillaCall::CharPositionFromPoint(int x, int y) {
return Call(Message::CharPositionFromPoint, x, y);
Position ScintillaCall::CharPositionFromPoint(Pixels x, Pixels y) {
return Call(Message::CharPositionFromPoint, static_cast<uintptr_t>(x), static_cast<intptr_t>(y));
}

Position ScintillaCall::CharPositionFromPointClose(int x, int y) {
return Call(Message::CharPositionFromPointClose, x, y);
Position ScintillaCall::CharPositionFromPointClose(Pixels x, Pixels y) {
return Call(Message::CharPositionFromPointClose, static_cast<uintptr_t>(x), static_cast<intptr_t>(y));
}

void ScintillaCall::SetMouseSelectionRectangularSwitch(bool mouseSelectionRectangularSwitch) {
Expand Down Expand Up @@ -3035,8 +3035,8 @@ void ScintillaCall::AddSelection(Position caret, Position anchor) {
Call(Message::AddSelection, caret, anchor);
}

int ScintillaCall::SelectionFromPoint(int x, int y) {
return static_cast<int>(Call(Message::SelectionFromPoint, x, y));
int ScintillaCall::SelectionFromPoint(Pixels x, Pixels y) {
return static_cast<int>(Call(Message::SelectionFromPoint, static_cast<uintptr_t>(x), static_cast<intptr_t>(y)));
}

void ScintillaCall::DropSelectionN(int selection) {
Expand Down
Loading
Loading