diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-04-15 16:47:52 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-04-15 16:47:52 +1000 |
| commit | faf57f45eae60a257a8076c83c71c422486f88ce (patch) | |
| tree | bae925421b4048bc7de7784e38d73b9960e85553 /cocoa | |
| parent | 75dba090f235fc4d24691bd1b57928f89ebe9f1b (diff) | |
| download | scintilla-mirror-faf57f45eae60a257a8076c83c71c422486f88ce.tar.gz | |
Avoid calling virtual functions in constructors and destructors.
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 2 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 4 |
2 files changed, 3 insertions, 3 deletions
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(); |