diff options
| author | Neil <nyamatongwe@gmail.com> | 2024-01-17 21:25:19 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2024-01-17 21:25:19 +1100 |
| commit | b12c4ff365b8868fe9a85e87da92bc30d4f640ee (patch) | |
| tree | fcb748b3c592d6d3a31155c7eba9ac32c8f0ae7c | |
| parent | a8f11ce783cc8c8d33f22f227e5f19f5b94ce50f (diff) | |
| download | scintilla-mirror-b12c4ff365b8868fe9a85e87da92bc30d4f640ee.tar.gz | |
Fix reference from ScintillaDocument to Document to match change in 5.4.1
using IDocumentEditable for SCI_GETDOCPOINTER and SCI_SETDOCPOINTER.
| -rw-r--r-- | doc/ScintillaHistory.html | 12 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.cpp | 2 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.h | 7 |
3 files changed, 19 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 6708cc990..34013fe70 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -584,6 +584,18 @@ </table> <h2>Releases</h2> <h3> + <a href="https://www.scintilla.org/scintilla542.zip">Release 5.4.2</a> + </h3> + <ul> + <li> + Released 27 December 2023. + </li> + <li> + For ScintillaEdit on Qt, fix reference from ScintillaDocument to Document to match change in 5.4.1 + using IDocumentEditable for SCI_GETDOCPOINTER and SCI_SETDOCPOINTER. + </li> + </ul> + <h3> <a href="https://www.scintilla.org/scintilla541.zip">Release 5.4.1</a> </h3> <ul> diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp index 73fa67bb4..977edc45f 100644 --- a/qt/ScintillaEdit/ScintillaDocument.cpp +++ b/qt/ScintillaEdit/ScintillaDocument.cpp @@ -89,7 +89,7 @@ void WatcherHelper::NotifyErrorOccurred(Document *, void *, Status status) { } ScintillaDocument::ScintillaDocument(QObject *parent, void *pdoc_) : - QObject(parent), pdoc(pdoc_), docWatcher(nullptr) { + QObject(parent), pdoc(static_cast<Scintilla::IDocumentEditable *>(pdoc_)), docWatcher(nullptr) { if (!pdoc) { pdoc = new Document(DocumentOption::Default); } diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h index 579990781..8108fd2fa 100644 --- a/qt/ScintillaEdit/ScintillaDocument.h +++ b/qt/ScintillaEdit/ScintillaDocument.h @@ -23,11 +23,16 @@ class WatcherHelper; #endif #endif +// Forward declaration +namespace Scintilla { + class IDocumentEditable; +} + class EXPORT_IMPORT_API ScintillaDocument : public QObject { Q_OBJECT - void *pdoc; + Scintilla::IDocumentEditable *pdoc; WatcherHelper *docWatcher; public: |