CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ upd: compiler version (VS2017) and Scintilla (current GitHub mirror)

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-05-15 09:52:48 +02:00
parent c72799bb8c
commit c8cbc21efc
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scintilla/src/EditView.cxx
View File

@ -2019,7 +2019,7 @@ void EditView::DrawLine(Surface *surface, const EditModel &model, const ViewStyl
return; // No further drawing
}
// See if something overrides the line background color.
// See if something overrides the line background colour.
const ColourOptional background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
const Sci::Position posLineStart = model.pdoc->LineStart(line);

2
scintilla/src/MarginView.cxx
View File

@ -420,7 +420,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc,
DrawStyledText(surface, vs, vs.marginStyleOffset, rcMarker,
stMargin, 0, stMargin.length, drawAll);
} else {
// if we're displaying annotation lines, color the margin to match the associated document line
// if we're displaying annotation lines, colour the margin to match the associated document line
const int annotationLines = model.pdoc->AnnotationLines(lineDoc);
if (annotationLines && (visibleLine > lastVisibleLine - annotationLines)) {
surface->FillRectangle(rcMarker, vs.styles[stMargin.StyleAt(0) + vs.marginStyleOffset].back);

8
scintilla/src/ViewStyle.cxx
View File

@ -443,12 +443,12 @@ bool ViewStyle::IsLineFrameOpaque(bool caretActive, bool lineContainsCaret) cons
(caretLineAlpha == SC_ALPHA_NOALPHA) && lineContainsCaret;
}
// See if something overrides the line background color: Either if caret is on the line
// and background color is set for that, or if a marker is defined that forces its background
// color onto the line, or if a marker is defined but has no selection margin in which to
// See if something overrides the line background colour: Either if caret is on the line
// and background colour is set for that, or if a marker is defined that forces its background
// colour onto the line, or if a marker is defined but has no selection margin in which to
// display itself (as long as it's not an SC_MARK_EMPTY marker). These are checked in order
// with the earlier taking precedence. When multiple markers cause background override,
// the color for the highest numbered one is used.
// the colour for the highest numbered one is used.
ColourOptional ViewStyle::Background(int marksOfLine, bool caretActive, bool lineContainsCaret) const {
ColourOptional background;
if (!caretLineFrame && (caretActive || alwaysShowCaretLineBackground) && showCaretLineBackground &&

6
scintilla/src/XPM.cxx
View File

@ -194,7 +194,7 @@ std::vector<const char *> XPM::LinesFormFromTextForm(const char *textForm) {
for (; countQuotes < (2*strings) && textForm[j] != '\0'; j++) {
if (textForm[j] == '\"') {
if (countQuotes == 0) {
// First field: width, height, number of colors, chars per pixel
// First field: width, height, number of colours, chars per pixel
const char *line0 = textForm + j + 1;
// Skip width
line0 = NextField(line0);
@ -205,7 +205,7 @@ std::vector<const char *> XPM::LinesFormFromTextForm(const char *textForm) {
strings += atoi(line0);
}
if (countQuotes / 2 >= strings) {
break; // Bad height or number of colors!
break; // Bad height or number of colours!
}
if ((countQuotes & 1) == 0) {
linesForm.push_back(textForm + j + 1);
@ -214,7 +214,7 @@ std::vector<const char *> XPM::LinesFormFromTextForm(const char *textForm) {
}
}
if (textForm[j] == '\0' || countQuotes / 2 > strings) {
// Malformed XPM! Height + number of colors too high or too low
// Malformed XPM! Height + number of colours too high or too low
linesForm.clear();
}
return linesForm;

14
scintilla/win32/PlatWin.cxx
View File

@ -432,7 +432,7 @@ class SurfaceGDI : public Surface {
int codePage = 0;
void BrushColor(ColourDesired back) noexcept;
void BrushColour(ColourDesired back) noexcept;
void SetFont(const Font &font_) noexcept;
void Clear() noexcept;
@ -573,7 +573,7 @@ void SurfaceGDI::PenColour(ColourDesired fore) {
penOld = SelectPen(hdc, pen);
}
void SurfaceGDI::BrushColor(ColourDesired back) noexcept {
void SurfaceGDI::BrushColour(ColourDesired back) noexcept {
if (brush) {
::SelectObject(hdc, brushOld);
::DeleteObject(brush);
@ -614,7 +614,7 @@ void SurfaceGDI::LineTo(int x_, int y_) {
void SurfaceGDI::Polygon(Point *pts, size_t npts, ColourDesired fore, ColourDesired back) {
PenColour(fore);
BrushColor(back);
BrushColour(back);
std::vector<POINT> outline;
for (size_t i=0; i<npts; i++) {
POINT pt = {static_cast<LONG>(pts[i].x), static_cast<LONG>(pts[i].y)};
@ -625,7 +625,7 @@ void SurfaceGDI::Polygon(Point *pts, size_t npts, ColourDesired fore, ColourDesi
void SurfaceGDI::RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) {
PenColour(fore);
BrushColor(back);
BrushColour(back);
const RECT rcw = RectFromPRectangle(rc);
::Rectangle(hdc, rcw.left, rcw.top, rcw.right, rcw.bottom);
}
@ -651,7 +651,7 @@ void SurfaceGDI::FillRectangle(PRectangle rc, Surface &surfacePattern) {
void SurfaceGDI::RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back) {
PenColour(fore);
BrushColor(back);
BrushColour(back);
const RECT rcw = RectFromPRectangle(rc);
::RoundRect(hdc,
rcw.left + 1, rcw.top,
@ -743,7 +743,7 @@ void SurfaceGDI::AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fil
}
::DeleteDC(hMemDC);
} else {
BrushColor(outline);
BrushColour(outline);
FrameRect(hdc, &rcw, brush);
}
}
@ -802,7 +802,7 @@ void SurfaceGDI::DrawRGBAImage(PRectangle rc, int width, int height, const unsig
void SurfaceGDI::Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) {
PenColour(fore);
BrushColor(back);
BrushColour(back);
const RECT rcw = RectFromPRectangle(rc);
::Ellipse(hdc, rcw.left, rcw.top, rcw.right, rcw.bottom);
}

8
src/Version.h
View File

@ -73,7 +73,11 @@
#define VER_CPL MS Visual C++ 2019 v16.0.Prev(1-4)
#endif
#elif (_MSC_VER >= 1916)
#if(_MSC_FULL_VER >= 191627027)
#if(_MSC_FULL_VER >= 191627031)
#define VER_CPL MS Visual C++ 2017 v15.9.12
#elif(_MSC_FULL_VER >= 191627030)
#define VER_CPL MS Visual C++ 2017 v15.9.11
#elif(_MSC_FULL_VER >= 191627027)
#define VER_CPL MS Visual C++ 2017 v15.9.(7-10)
#elif(_MSC_FULL_VER >= 191627026)
#define VER_CPL MS Visual C++ 2017 v15.9.(5-6)
@ -85,7 +89,7 @@
#define VER_CPL MS Visual C++ 2017 v15.9.(0-1)
#endif
#elif (_MSC_VER >= 1915)
#if(_MSC_FULL_VER >= 191526732)
#if(_MSC_FULL_VER >= 191526732)
#define VER_CPL MS Visual C++ 2017 v15.8.(8-9)
#elif(_MSC_FULL_VER >= 191526730)
#define VER_CPL MS Visual C++ 2017 v15.8.(5-7)