diff options
| -rw-r--r-- | src/Editor.h | 4 | ||||
| -rw-r--r-- | src/ScintillaBase.h | 4 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/Editor.h b/src/Editor.h index eb921541f..c5bddb1e0 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -260,7 +260,7 @@ protected: // ScintillaBase subclass needs access to much of Editor Editor(Editor &&) = delete; Editor &operator=(const Editor &) = delete; Editor &operator=(Editor &&) = delete; - ~Editor() override; + // ~Editor() in public section virtual void Initialise() = 0; virtual void Finalise(); @@ -599,6 +599,8 @@ protected: // ScintillaBase subclass needs access to much of Editor static sptr_t BytesResult(sptr_t lParam, const unsigned char *val, size_t len) noexcept; public: + ~Editor() override; + // Public so the COM thunks can access it. bool IsUnicodeMode() const noexcept; // Public so scintilla_send_message can use it. diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h index e886f22e2..39fb9d411 100644 --- a/src/ScintillaBase.h +++ b/src/ScintillaBase.h @@ -57,7 +57,7 @@ protected: ScintillaBase(ScintillaBase &&) = delete; ScintillaBase &operator=(const ScintillaBase &) = delete; ScintillaBase &operator=(ScintillaBase &&) = delete; - ~ScintillaBase() override; + // ~ScintillaBase() in public section void Initialise() override {} void Finalise() override; @@ -94,6 +94,8 @@ protected: void NotifyLexerChanged(Document *doc, void *userData) override; public: + ~ScintillaBase() override; + // Public so scintilla_send_message can use it sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; }; diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 6008fd51b..7dc0a9255 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -303,7 +303,7 @@ class ScintillaWin : ScintillaWin(ScintillaWin &&) = delete; ScintillaWin &operator=(const ScintillaWin &) = delete; ScintillaWin &operator=(ScintillaWin &&) = delete; - ~ScintillaWin() override; + // ~ScintillaWin() in public section void Init(); void Finalise() override; @@ -399,6 +399,8 @@ class ScintillaWin : sptr_t GetText(uptr_t wParam, sptr_t lParam); public: + ~ScintillaWin() override; + // Public for benefit of Scintilla_DirectFunction sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; |