From 7ec8d3b74b199afc2b16d3e7b9139ead237fc3b9 Mon Sep 17 00:00:00 2001
From: wp <wp.no-reply@lazarus-ide-org>
Date: Fri, 1 Jan 2021 15:50:39 +0000
Subject: [PATCH] TurboPower_iPro: Fix compilation of HtmlFileExp1 and
 HtmlFileExp2 demo projects.

git-svn-id: trunk@64316 -
---
 .../turbopower_ipro/examples/htmfileexp1.lfm  |  6 ++---
 .../turbopower_ipro/examples/htmfileexp1.pas  | 16 --------------
 .../turbopower_ipro/examples/htmfileexp2.lfm  |  6 ++---
 .../turbopower_ipro/examples/htmfileexp2.pas  | 22 +++----------------
 4 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/components/turbopower_ipro/examples/htmfileexp1.lfm b/components/turbopower_ipro/examples/htmfileexp1.lfm
index 37d717448b..36f47365ca 100644
--- a/components/turbopower_ipro/examples/htmfileexp1.lfm
+++ b/components/turbopower_ipro/examples/htmfileexp1.lfm
@@ -9,7 +9,7 @@ object FHtmFileExp1: TFHtmFileExp1
   ClientWidth = 777
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '1.7'
+  LCLVersion = '2.1.0.0'
   object IpHtmlPanel1: TIpHtmlPanel
     Left = 0
     Height = 525
@@ -177,7 +177,7 @@ object FHtmFileExp1: TFHtmFileExp1
   object OpenDialog1: TOpenDialog
     Filter = 'Web Pages|*.html;*.htm'
     FilterIndex = 0
-    left = 48
-    top = 80
+    Left = 48
+    Top = 80
   end
 end
diff --git a/components/turbopower_ipro/examples/htmfileexp1.pas b/components/turbopower_ipro/examples/htmfileexp1.pas
index dda085c0e9..0db0ef79b2 100644
--- a/components/turbopower_ipro/examples/htmfileexp1.pas
+++ b/components/turbopower_ipro/examples/htmfileexp1.pas
@@ -130,22 +130,6 @@ begin
           PicCreated := True;
         end;
         Picture.LoadFromFile(FN);
-      end
-      else  begin
-        PicCreated := False;
-        BitMap := Graphics.TBitMap.Create;
-        with TLinearBitmap.Create do
-          try
-            LoadFromFile (FN);
-            AssignTo (Bitmap);
-            Picture.Bitmap.Assign (BitMap);
-            PicCreated := True;
-          finally
-            Bitmap.Free;
-            Free;
-          end;
-      end;
-     {$ENDIF}
     end;
   except
     if PicCreated then
diff --git a/components/turbopower_ipro/examples/htmfileexp2.lfm b/components/turbopower_ipro/examples/htmfileexp2.lfm
index 59a43db73f..7ef9793f9a 100644
--- a/components/turbopower_ipro/examples/htmfileexp2.lfm
+++ b/components/turbopower_ipro/examples/htmfileexp2.lfm
@@ -8,7 +8,7 @@ object FHtmFileExp2: TFHtmFileExp2
   ClientHeight = 327
   ClientWidth = 569
   OnCreate = FormCreate
-  LCLVersion = '1.7'
+  LCLVersion = '2.1.0.0'
   object P_Top: TPanel
     Left = 0
     Height = 42
@@ -154,7 +154,7 @@ object FHtmFileExp2: TFHtmFileExp2
   object OpenDialog1: TOpenDialog
     Filter = 'Web Pages|*.html;*.htm'
     FilterIndex = 0
-    left = 26
-    top = 93
+    Left = 26
+    Top = 93
   end
 end
diff --git a/components/turbopower_ipro/examples/htmfileexp2.pas b/components/turbopower_ipro/examples/htmfileexp2.pas
index 4ce1b91f27..221dd902c0 100644
--- a/components/turbopower_ipro/examples/htmfileexp2.pas
+++ b/components/turbopower_ipro/examples/htmfileexp2.pas
@@ -122,26 +122,10 @@ begin
     FN := Concat (FN, nURL);
     if FileExistsUTF8(FN) then begin
       if Picture = nil then begin
-          Picture := TPicture.Create;
-          PicCreated := True;
-        end;
-        Picture.LoadFromFile(FN);
-      end
-      else begin
-        PicCreated := False;
-        BitMap := Graphics.TBitMap.Create;
-        with TLinearBitmap.Create do
-          try
-            LoadFromFile (FN);
-            AssignTo (Bitmap);
-            Picture.Bitmap.Assign (BitMap);
-            PicCreated := True;
-          finally
-            Bitmap.Free;
-            Free;
-          end;
+        Picture := TPicture.Create;
+        PicCreated := True;
       end;
-     {$ENDIF}
+      Picture.LoadFromFile(FN);
     end;
   except
     if PicCreated then