From 10a5d9c1ad664657b743eb63354dc98a417eb45c Mon Sep 17 00:00:00 2001
From: blikblum <blikblum@lazarus-ide.org>
Date: Sat, 25 May 2013 23:44:01 +0000
Subject: [PATCH] Remove DoCreateWnd. Move its code to CreateWnd Commit missing
 part of 41407

git-svn-id: trunk@41408 -
---
 lcl/comctrls.pp                |  4 +---
 lcl/include/customnotebook.inc | 19 +++----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index 00f59ed61f..54ac231002 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -366,11 +366,10 @@ type
     procedure CNNotify(var Message: TLMNotify); message CN_NOTIFY;
     class procedure WSRegisterClass; override;
     procedure CreateWnd; override;
-    procedure DoCreateWnd; virtual;
     procedure DoChange; virtual;
+    procedure InitializeWnd; override;
     procedure Change; virtual;
     procedure KeyDown(var Key: Word; Shift: TShiftState); override;
-    procedure Loaded; override;
     procedure ReadState(Reader: TReader); override;
     function  DialogChar(var Message: TLMKey): boolean; override;
     procedure ShowControl(APage: TControl); override;
@@ -1129,7 +1128,6 @@ type
     procedure WSCreateColumns;
     procedure SetItem(const AIndex: Integer; const AValue: TListColumn);
   protected
-    function GetOwner: TPersistent; override;
   public
     constructor Create(AOwner: TCustomListView);
     destructor Destroy; override;
diff --git a/lcl/include/customnotebook.inc b/lcl/include/customnotebook.inc
index 5a760efc71..c7174c4088 100644
--- a/lcl/include/customnotebook.inc
+++ b/lcl/include/customnotebook.inc
@@ -240,34 +240,21 @@ end;
   Creates the interface object.
  ------------------------------------------------------------------------------}
 procedure TCustomTabControl.CreateWnd;
-begin
-  {$IFDEF NOTEBOOK_DEBUG}
-  DebugLn(['TCustomTabControl.CreateWnd ',dbgsName(Self),' HandleAllocated=',HandleAllocated]);
-  {$ENDIF}
-  inherited CreateWnd;
-  DoCreateWnd;
-end;
-
-{------------------------------------------------------------------------------
-  procedure TCustomTabControl.DoCreateWnd;
-
-  Creates the handles for the pages and updates the notebook handle.
- ------------------------------------------------------------------------------}
-procedure TCustomTabControl.DoCreateWnd;
 var
   i: Integer;
   lPage: TCustomPage;
 begin
   {$IFDEF NOTEBOOK_DEBUG}
-  DebugLn(['TCustomTabControl.DoCreateWnd ',dbgsName(Self),' HandleAllocated=',HandleAllocated]);
+  DebugLn(['TCustomTabControl.CreateWnd ',dbgsName(Self),' HandleAllocated=',HandleAllocated]);
   {$ENDIF}
+  inherited CreateWnd;
   DisableAlign;
   try
     FAddingPages := True;
     for i := 0 to PageCount -1 do
     begin
       {$IFDEF NOTEBOOK_DEBUG}
-      DebugLn(['TCustomTabControl.DoCreateWnd ',dbgsName(Self),' Page.Caption=',Page[i].Caption,' pfAdded=',pfAdded in Page[i].Flags]);
+      DebugLn(['TCustomTabControl.CreateWnd ',dbgsName(Self),' Page.Caption=',Page[i].Caption,' pfAdded=',pfAdded in Page[i].Flags]);
       {$ENDIF}
       lPage := Page[i];
       AddRemovePageHandle(lPage);