From 37e4358e811eb1bd46daac90b6f4013a2b24161a Mon Sep 17 00:00:00 2001
From: Graeme Geldenhuys <graeme@mastermaths.co.za>
Date: Mon, 29 Aug 2011 11:47:05 +0200
Subject: richview: removed DoAllocateWindowHandle() which caused a memory
 leak.

The above mentioned method called CreateWnd() twice, thus causing a memory
leak. Now CreateWnd() is simply called once in the constructor.
---
 docview/components/richtext/RichTextView.pas | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'docview/components')

diff --git a/docview/components/richtext/RichTextView.pas b/docview/components/richtext/RichTextView.pas
index 4c63f013..91bcab25 100644
--- a/docview/components/richtext/RichTextView.pas
+++ b/docview/components/richtext/RichTextView.pas
@@ -139,7 +139,6 @@ Type
     FLastLinkOver: string;
     FClickedLink: string;
 
-    procedure DoAllocateWindowHandle(AParent: TfpgWindowBase); override;
     Procedure CreateWnd;
     procedure HandleResize(AWidth, AHeight: TfpgCoord); override;
     procedure UpdateScrollBarCoords;
@@ -646,6 +645,8 @@ begin
     FTopCharIndex := 0;
     FVerticalPositionInitialised := false;
   end;
+
+  CreateWnd;
 end;
 
 procedure TRichTextView.HandlePaint;
@@ -851,8 +852,7 @@ Begin
   // while the canvas is still valid
   // (it will be freed in TControl.DisposeWnd)
   // in order to release logical fonts
-  if FFontManager <> nil then
-    FFontManager.Free;
+  FFontManager.Free;
   if Assigned(FLayout) then
     FreeAndNil(FLayout);
 
@@ -932,15 +932,8 @@ begin
   FDefaultMenu.ShowAt(x, y);
 end;
 
-procedure TRichTextView.DoAllocateWindowHandle(AParent: TfpgWindowBase);
-begin
-  inherited DoAllocateWindowHandle(AParent);
-  CreateWnd;
-end;
-
 Procedure TRichTextView.CreateWnd;
 begin
-ProfileEvent('DEBUG:  TRichTextView.CreateWnd >>>>');
   if InDesigner then
     exit;
 
@@ -973,7 +966,6 @@ ProfileEvent('DEBUG:  TRichTextView.CreateWnd >>>>');
   if FLayoutRequired then
     // we haven't yet done a layout
     Layout;
-ProfileEvent('DEBUG:  TRichTextView.CreateWnd <<<<');
 end;
 
 procedure TRichTextView.HandleResize(AWidth, AHeight: TfpgCoord);
-- 
cgit v1.2.3-70-g09d2