diff options
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 2 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 1 | ||||
| -rw-r--r-- | cocoa/ScintillaView.mm | 1 |
3 files changed, 2 insertions, 2 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; |