diff options
-rw-r--r-- | cocoa/ScintillaCocoa.h | 2 | ||||
-rw-r--r-- | cocoa/ScintillaCocoa.mm | 4 | ||||
-rw-r--r-- | gtk/PlatGTK.cxx | 9 | ||||
-rw-r--r-- | gtk/ScintillaGTK.cxx | 7 | ||||
-rw-r--r-- | gtk/ScintillaGTK.h | 2 | ||||
-rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 4 | ||||
-rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 2 | ||||
-rw-r--r-- | src/PerLine.cxx | 11 | ||||
-rw-r--r-- | src/ScintillaBase.h | 2 | ||||
-rw-r--r-- | win32/ScintillaWin.cxx | 6 |
10 files changed, 30 insertions, 19 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(); diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 8a00fcdad..8b0c997da 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -168,6 +168,7 @@ public: void Init(SurfaceID sid, WindowID wid) override; void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override; + void Clear(); void Release() override; bool Initialised() override; void PenColour(ColourDesired fore) override; @@ -276,10 +277,10 @@ x(0), y(0), inited(false), createdGC(false) } SurfaceImpl::~SurfaceImpl() { - Release(); + Clear(); } -void SurfaceImpl::Release() { +void SurfaceImpl::Clear() { et = singleByte; if (createdGC) { createdGC = false; @@ -303,6 +304,10 @@ void SurfaceImpl::Release() { createdGC = false; } +void SurfaceImpl::Release() { + Clear(); +} + bool SurfaceImpl::Initialised() { #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 8, 0) if (inited && context) { diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 75876dc53..52d0ed7e7 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -205,7 +205,7 @@ ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) : lastWheelMouseTime.tv_sec = 0; lastWheelMouseTime.tv_usec = 0; - Initialise(); + Init(); } ScintillaGTK::~ScintillaGTK() { @@ -549,8 +549,7 @@ void ScintillaGTK::SizeAllocate(GtkWidget *widget, GtkAllocation *allocation) { } } -void ScintillaGTK::Initialise() { - //Platform::DebugPrintf("ScintillaGTK::Initialise\n"); +void ScintillaGTK::Init() { parentClass = reinterpret_cast<GtkWidgetClass *>( g_type_class_ref(gtk_container_get_type())); @@ -3044,7 +3043,7 @@ void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_ // Define default signal handlers for the class: Could move more // of the signal handlers here (those that currently attached to wDraw - // in Initialise() may require coordinate translation?) + // in Init() may require coordinate translation?) object_class->dispose = Dispose; object_class->finalize = Destroy; diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h index 95ad953f0..d59a4ef29 100644 --- a/gtk/ScintillaGTK.h +++ b/gtk/ScintillaGTK.h @@ -81,7 +81,7 @@ public: static ScintillaGTK *FromWidget(GtkWidget *widget); static void ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class); private: - virtual void Initialise(); + void Init(); virtual void Finalise(); virtual bool AbandonPaint(); virtual void DisplayCursor(Window::Cursor c); diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index c5490a1d6..afa19e5a5 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -45,7 +45,7 @@ ScintillaQt::ScintillaQt(QAbstractScrollArea *parent) // Buffered drawing turned off by default to avoid this. WndProc(SCI_SETBUFFEREDDRAW, false, 0); - Initialise(); + Init(); for (TickReason tr = tickCaret; tr <= tickDwell; tr = static_cast<TickReason>(tr + 1)) { timers[tr] = 0; @@ -128,7 +128,7 @@ static ScintillaRectangularMime *singletonMime = 0; #endif -void ScintillaQt::Initialise() +void ScintillaQt::Init() { #if defined(Q_OS_WIN) || defined(Q_OS_MAC) rectangularSelectionModifier = SCMOD_ALT; diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index d140c6e5c..bfa67339c 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -99,7 +99,7 @@ private slots: void SelectionChanged(); private: - virtual void Initialise(); + void Init(); virtual void Finalise(); virtual bool DragThreshold(Point ptStart, Point ptNow); virtual bool ValidCodePage(int codePage) const; 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); diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index fdcfbda53..e4547f6b6 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -276,7 +276,7 @@ class ScintillaWin : ~ScintillaWin() override; ScintillaWin &operator=(const ScintillaWin &); - void Initialise() override; + void Init(); void Finalise() override; #if defined(USE_D2D) void EnsureRenderTarget(HDC hdc); @@ -459,12 +459,12 @@ ScintillaWin::ScintillaWin(HWND hwnd) { if (caret.period < 0) caret.period = 0; - Initialise(); + Init(); } ScintillaWin::~ScintillaWin() {} -void ScintillaWin::Initialise() { +void ScintillaWin::Init() { // Initialize COM. If the app has already done this it will have // no effect. If the app hasn't, we really shouldn't ask them to call // it just so this internal feature works. |