From faf57f45eae60a257a8076c83c71c422486f88ce Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 15 Apr 2017 16:47:52 +1000 Subject: Avoid calling virtual functions in constructors and destructors. --- gtk/ScintillaGTK.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gtk/ScintillaGTK.cxx') 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( 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; -- cgit v1.2.3