From 4aef0be3b00e360941008ae768d04b3a24ecc2ee Mon Sep 17 00:00:00 2001
From: wp <wp.no-reply@lazarus-ide-org>
Date: Thu, 22 Oct 2020 14:58:52 +0000
Subject: [PATCH] TurboPower_iPro: Undo part of r64045 #9244e15009, introduce
 TIpHtml.Parent for TIpHtmlNodeButton.Control. Issue #37927, patch by Zaher
 Dirkey.

git-svn-id: trunk@64051 -
---
 components/turbopower_ipro/iphtml.pas | 44 +++++++++++----------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/components/turbopower_ipro/iphtml.pas b/components/turbopower_ipro/iphtml.pas
index 103eb66794..45567e912b 100644
--- a/components/turbopower_ipro/iphtml.pas
+++ b/components/turbopower_ipro/iphtml.pas
@@ -2107,6 +2107,7 @@ type
     FDefaultFontSize: integer;
     ParmBuf: PChar;
     ParmBufSize: Integer;
+    FParent: TWinControl;
     procedure ResetCanvasData;
     procedure ResetWordLists;
     procedure ResetBlocks(Node: TIpHtmlNode);
@@ -2802,7 +2803,6 @@ type
     destructor Destroy; override;
     procedure EraseBackground(DC: HDC); {$IFDEF IP_LAZARUS} override; {$ENDIF}
 
-    procedure AddNodeControl(AControlNode: TIpHtmlNodeControl);
     procedure CopyToClipboard;
     procedure EnumDocuments(Enumerator: TIpHtmlEnumerator);
     procedure GoBack;
@@ -13233,6 +13233,8 @@ begin
   inherited Create(ParentNode);
   FElementName := 'button';
   Owner.FControlList.Add(Self);
+  if Owner.DoneLoading then
+    CreateControl(Owner.FParent);
 end;
 
 destructor TIpHtmlNodeBUTTON.Destroy;
@@ -13255,24 +13257,6 @@ begin
     Enabled := not Self.Disabled;
     Caption := Value;
     OnClick := ButtonClick;
-    case ButtonType of
-    hbtSubmit :
-      begin
-        OnClick := SubmitClick;
-        if Caption = '' then
-          Caption := SHtmlDefSubmitCaption;
-      end;
-    hbtReset :
-      begin
-        OnClick := ResetClick;
-        if Caption = '' then
-          Caption := SHtmlDefResetCaption;
-      end;
-    hbtButton :
-      begin
-        OnClick := ButtonClick;
-      end;
-    end;
     CalcSize;
   end;
 end;
@@ -13293,7 +13277,20 @@ end;
 
 procedure TIpHtmlNodeBUTTON.ButtonClick(Sender: TObject);
 begin
-  Owner.ControlClick(Self);
+  case ButtonType of
+  hbtSubmit :
+    begin
+      SubmitRequest;
+    end;
+  hbtReset :
+    begin
+      ResetRequest;
+    end;
+  hbtButton :
+    begin
+      Owner.ControlClick(Self);
+    end;
+  end;
 end;
 
 function TIpHtmlNodeBUTTON.Successful: Boolean;
@@ -13318,7 +13315,6 @@ end;
 
 procedure TIpHtmlNodeBUTTON.SetInputType(const AValue: TIpHtmlButtonType);
 begin
-  if FInputType = AValue then Exit;
   FInputType := AValue;
 
   if Owner.DoneLoading and (FControl <> nil) and (Self.Value = '') then;
@@ -15103,6 +15099,7 @@ begin
     HyperPanel.OnHotClick := FViewer.HotClick;
     HyperPanel.OnClick := FViewer.ClientClick;
     HyperPanel.TabStop := FViewer.WantTabs;
+    FHtml.FParent := HyperPanel;
     FHtml.OnScroll := HyperPanel.ScrollRequest;
     FHtml.OnControlClick := ControlClick;
     FHtml.OnControlClick2 := ControlClick2;
@@ -16402,11 +16399,6 @@ begin
   then  FMasterFrame.HyperPanel.VScroll.Position := Value;
 end;
 
-procedure TIpHtmlCustomPanel.AddNodeControl(AControlNode: TIpHtmlNodeControl);
-begin
-  AControlNode.CreateControl(FMasterFrame.HyperPanel);
-end;
-
 
 { TIpHtmlCustomScanner }