diff options
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 2 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 1 | ||||
| -rw-r--r-- | cocoa/ScintillaView.mm | 1 | ||||
| -rw-r--r-- | src/ScintillaBase.h | 20 |
4 files changed, 12 insertions, 12 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 317c51333..4c9da0f4a 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -129,7 +129,6 @@ protected: void Redraw() override; void Init(); - void Finalise() override; CaseFolder *CaseFolderForEncoding() override; std::string CaseMapString(const std::string &s, int caseMapping) override; void CancelModes() override; @@ -137,6 +136,7 @@ protected: public: ScintillaCocoa(ScintillaView* sciView_, SCIContentView* viewContent, SCIMarginView* viewMargin); ~ScintillaCocoa() override; + void Finalise() override; void SetDelegate(id<ScintillaNotificationProtocol> delegate_); void RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc callback); diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index d15a34990..9af203a18 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -429,7 +429,6 @@ ScintillaCocoa::ScintillaCocoa(ScintillaView* sciView_, SCIContentView* viewCont ScintillaCocoa::~ScintillaCocoa() { - Finalise(); [timerTarget ownerDestroyed]; [timerTarget release]; } diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index d4ad526d7..f4c4f615f 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -1559,6 +1559,7 @@ sourceOperationMaskForDraggingContext: (NSDraggingContext) context - (void) dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; + mBackend->Finalise(); delete mBackend; mBackend = NULL; mContent.owner = nil; diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h index f1e452410..bf14d3354 100644 --- a/src/ScintillaBase.h +++ b/src/ScintillaBase.h @@ -60,12 +60,12 @@ protected: ScintillaBase(); virtual ~ScintillaBase(); void Initialise() override {} - virtual void Finalise(); + void Finalise() override; - virtual void AddCharUTF(const char *s, unsigned int len, bool treatAsDBCS=false); + void AddCharUTF(const char *s, unsigned int len, bool treatAsDBCS=false) override; void Command(int cmdId); - virtual void CancelModes(); - virtual int KeyCommand(unsigned int iMessage); + void CancelModes() override; + int KeyCommand(unsigned int iMessage) override; void AutoCompleteInsert(Sci::Position startPos, int removeLen, const char *text, int textLen); void AutoCompleteStart(int lenEntered, const char *list); @@ -87,16 +87,16 @@ protected: bool ShouldDisplayPopup(Point ptInWindowCoordinates) const; void ContextMenu(Point pt); - virtual void ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers); - virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt); - virtual void RightButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers); + void ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers) override; + void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) override; + void RightButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers) override; - void NotifyStyleToNeeded(Sci::Position endStyleNeeded); - void NotifyLexerChanged(Document *doc, void *userData); + void NotifyStyleToNeeded(Sci::Position endStyleNeeded) override; + void NotifyLexerChanged(Document *doc, void *userData) override; public: // Public so scintilla_send_message can use it - virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); + sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; }; #ifdef SCI_NAMESPACE |