From faf57f45eae60a257a8076c83c71c422486f88ce Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 15 Apr 2017 16:47:52 +1000
Subject: Avoid calling virtual functions in constructors and destructors.

---
 cocoa/ScintillaCocoa.h  | 2 +-
 cocoa/ScintillaCocoa.mm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'cocoa')

diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 18cd5855f..317c51333 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -128,7 +128,7 @@ protected:
   void DiscardOverdraw() override;
   void Redraw() override;
 
-  void Initialise() override;
+  void Init();
   void Finalise() override;
   CaseFolder *CaseFolderForEncoding() override;
   std::string CaseMapString(const std::string &s, int caseMapping) override;
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index abbfd85dd..d15a34990 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -422,7 +422,7 @@ ScintillaCocoa::ScintillaCocoa(ScintillaView* sciView_, SCIContentView* viewCont
   {
     timers[tr] = nil;
   }
-  Initialise();
+  Init();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -439,7 +439,7 @@ ScintillaCocoa::~ScintillaCocoa()
 /**
  * Core initialization of the control. Everything that needs to be set up happens here.
  */
-void ScintillaCocoa::Initialise()
+void ScintillaCocoa::Init()
 {
   Scintilla_LinkLexers();
 
-- 
cgit v1.2.3