aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/PerLine.cxx11
-rw-r--r--src/ScintillaBase.h2
2 files changed, 10 insertions, 3 deletions
diff --git a/src/PerLine.cxx b/src/PerLine.cxx
index 41e767ab7..d03723c1b 100644
--- a/src/PerLine.cxx
+++ b/src/PerLine.cxx
@@ -121,7 +121,11 @@ void MarkerHandleSet::CombineWith(MarkerHandleSet *other) {
}
LineMarkers::~LineMarkers() {
- Init();
+ for (int line = 0; line < markers.Length(); line++) {
+ delete markers[line];
+ markers[line] = 0;
+ }
+ markers.DeleteAll();
}
void LineMarkers::Init() {
@@ -490,7 +494,10 @@ int LineAnnotation::Lines(Sci::Line line) const {
}
LineTabstops::~LineTabstops() {
- Init();
+ for (int line = 0; line < tabstops.Length(); line++) {
+ delete tabstops[line];
+ }
+ tabstops.DeleteAll();
}
void LineTabstops::Init() {
diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h
index f59722ec4..f1e452410 100644
--- a/src/ScintillaBase.h
+++ b/src/ScintillaBase.h
@@ -59,7 +59,7 @@ protected:
ScintillaBase();
virtual ~ScintillaBase();
- virtual void Initialise() = 0;
+ void Initialise() override {}
virtual void Finalise();
virtual void AddCharUTF(const char *s, unsigned int len, bool treatAsDBCS=false);