diff --git a/scintilla/call/ScintillaCall.cxx b/scintilla/call/ScintillaCall.cxx index be2c12a20..a5a6dd181 100644 --- a/scintilla/call/ScintillaCall.cxx +++ b/scintilla/call/ScintillaCall.cxx @@ -231,7 +231,7 @@ Position ScintillaCall::GetStyledText(void *tr) { return CallPointer(Message::GetStyledText, 0, tr); } -Position ScintillaCall::GetStyledTextFull(void *tr) { +Position ScintillaCall::GetStyledTextFull(TextRangeFull *tr) { return CallPointer(Message::GetStyledTextFull, 0, tr); } @@ -1175,7 +1175,7 @@ Position ScintillaCall::FindText(Scintilla::FindOption searchFlags, void *ft) { return CallPointer(Message::FindText, static_cast(searchFlags), ft); } -Position ScintillaCall::FindTextFull(Scintilla::FindOption searchFlags, void *ft) { +Position ScintillaCall::FindTextFull(Scintilla::FindOption searchFlags, TextToFindFull *ft) { return CallPointer(Message::FindTextFull, static_cast(searchFlags), ft); } @@ -1183,7 +1183,7 @@ Position ScintillaCall::FormatRange(bool draw, void *fr) { return CallPointer(Message::FormatRange, draw, fr); } -Position ScintillaCall::FormatRangeFull(bool draw, void *fr) { +Position ScintillaCall::FormatRangeFull(bool draw, RangeToFormatFull *fr) { return CallPointer(Message::FormatRangeFull, draw, fr); } @@ -1251,7 +1251,7 @@ Position ScintillaCall::GetTextRange(void *tr) { return CallPointer(Message::GetTextRange, 0, tr); } -Position ScintillaCall::GetTextRangeFull(void *tr) { +Position ScintillaCall::GetTextRangeFull(TextRangeFull *tr) { return CallPointer(Message::GetTextRangeFull, 0, tr); } diff --git a/scintilla/cppcheck.suppress b/scintilla/cppcheck.suppress index 66d8a9456..4d57ed25c 100644 --- a/scintilla/cppcheck.suppress +++ b/scintilla/cppcheck.suppress @@ -46,6 +46,10 @@ constVariable:scintilla/gtk/ScintillaGTKAccessible.cxx cstyleCast:scintilla/qt/ScintillaEdit/ScintillaEdit.cpp shadowFunction:scintilla/qt/ScintillaEdit/ScintillaEdit.cpp +// cppcheck fails emit from Qt +shadowFunction:scintilla/qt/ScintillaEditBase/ScintillaQt.cpp +shadowFunction:scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp + // moc_ files show #error as they are not built with standard context preprocessorErrorDirective:scintilla/qt/*.cpp @@ -58,3 +62,10 @@ passedByValue // Suppress everything in catch.hpp as won't be changing *:scintilla/test/unit/catch.hpp + +// Checks for moves move to variables that are not read but the moved from is checked +unreadVariable:scintilla/test/unit/*.cxx +accessMoved:scintilla/test/unit/*.cxx + +// cppcheck fails REQUIRE from Catch +comparisonOfFuncReturningBoolError:scintilla/test/unit/*.cxx diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html index 8fe205014..30411853e 100644 --- a/scintilla/doc/ScintillaDoc.html +++ b/scintilla/doc/ScintillaDoc.html @@ -129,7 +129,7 @@

Scintilla Documentation

-

Last edited 15 November 2022 NH

+

Last edited 14 January 2023 NH

Scintilla 5 has moved the lexers from Scintilla into a new Lexilla project.
@@ -6891,8 +6891,9 @@ struct Sci_TextToFindFull {

SCI_FORMATRANGE can be used to draw the text onto a display surface which can include a printer display surface. Printed output shows text styling as on the - screen, but it hides all margins except a line number margin. All special marker effects are - removed and the selection and caret are hidden.

+ screen, but it hides all margins except a line number margin. + Markers do not appear in a margin but will change line background colour. + The selection and caret are hidden.

Different platforms use different display surface ID types to print on. On Windows, these are HDCs., on GTK 3.x cairo_t *, diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html index a95404661..7316834a3 100644 --- a/scintilla/doc/ScintillaDownload.html +++ b/scintilla/doc/ScintillaDownload.html @@ -26,9 +26,9 @@ @@ -42,7 +42,7 @@ containing very few restrictions.

- Release 5.3.2 + Release 5.3.3

Source Code @@ -50,8 +50,8 @@ The source code package contains all of the source code for Scintilla but no binary executable code and is available in
    -
  • zip format (1.4M) commonly used on Windows
    • -
  • tgz format (1.3M) commonly used on Linux and compatible operating systems
    • +
  • zip format (1.4M) commonly used on Windows
    • +
  • tgz format (1.3M) commonly used on Linux and compatible operating systems
Instructions for building on both Windows and Linux are included in the readme file.

diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html index 97a9bb6b1..7e544789c 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -575,9 +575,80 @@

+
- + Windows   - + GTK/Linux   Reinhard Nißl Ferdinand Oeinck Michael HeathEnrico Tröger

Releases

+

+ Release 5.3.4 +

+ +

+ Release 5.3.3 +

+

Release 5.3.2

diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html index 97be0218d..4cb270530 100644 --- a/scintilla/doc/index.html +++ b/scintilla/doc/index.html @@ -9,7 +9,7 @@ - +