diff --git a/components/turbopower_ipro/examples/browser.lpi b/components/turbopower_ipro/examples/browser.lpi index de7f6a5c61..6525a63652 100644 --- a/components/turbopower_ipro/examples/browser.lpi +++ b/components/turbopower_ipro/examples/browser.lpi @@ -52,8 +52,7 @@ - - + @@ -72,6 +71,7 @@ + diff --git a/components/turbopower_ipro/examples/browserfrm.lfm b/components/turbopower_ipro/examples/browserfrm.lfm index 2833fc1245..ef364fb5c8 100644 --- a/components/turbopower_ipro/examples/browserfrm.lfm +++ b/components/turbopower_ipro/examples/browserfrm.lfm @@ -6,7 +6,7 @@ object frMain: TfrMain Caption = 'IPro browser' ClientHeight = 314 ClientWidth = 591 - LCLVersion = '1.7' + LCLVersion = '3.99.0.0' object pnTop: TPanel Left = 0 Height = 42 @@ -153,7 +153,7 @@ object frMain: TfrMain Anchors = [akTop, akLeft, akRight] ParentBidiMode = False TabOrder = 0 - Text = 'http://freepascal.org/' + Text = 'https://freepascal.org/' end object btGo: TSpeedButton Left = 546 @@ -181,17 +181,21 @@ object frMain: TfrMain PrintSettings.MarginTop = 0.5 PrintSettings.MarginRight = 0.5 PrintSettings.MarginBottom = 0.5 + PrintSettings.Preview.Left = 640 + PrintSettings.Preview.Top = 270 + PrintSettings.Preview.Width = 1920 + PrintSettings.Preview.Height = 810 TabOrder = 1 OnDocumentOpen = IpHtmlPanel1DocumentOpen end object IpHttpDataProvider1: TIpHttpDataProvider - left = 64 - top = 64 + Left = 64 + Top = 64 end object alMain: TActionList OnUpdate = alMainUpdate - left = 160 - top = 64 + Left = 160 + Top = 64 object acBack: TAction Category = 'Browser' Enabled = False @@ -205,8 +209,8 @@ object frMain: TfrMain object acGo: TAction Category = 'Browser' Caption = 'Go!' - OnExecute = acGoExecute ShortCut = 13 + OnExecute = acGoExecute end end end diff --git a/components/turbopower_ipro/examples/browserfrm.pas b/components/turbopower_ipro/examples/browserfrm.pas index b1ef6df0b0..22387eb0a7 100644 --- a/components/turbopower_ipro/examples/browserfrm.pas +++ b/components/turbopower_ipro/examples/browserfrm.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, Iphttpbroker, IpHtml, Forms, Buttons, ExtCtrls, StdCtrls, - ActnList; + ActnList, opensslsockets; type diff --git a/components/turbopower_ipro/examples/htmfileexp1.lfm b/components/turbopower_ipro/examples/htmfileexp1.lfm index 9dde61b9ed..0a11c6333b 100644 --- a/components/turbopower_ipro/examples/htmfileexp1.lfm +++ b/components/turbopower_ipro/examples/htmfileexp1.lfm @@ -7,9 +7,9 @@ object FHtmFileExp1: TFHtmFileExp1 Caption = 'Example 1 for turbopower: HTM File Explorer' ClientHeight = 567 ClientWidth = 777 + LCLVersion = '3.99.0.0' OnCreate = FormCreate OnDestroy = FormDestroy - LCLVersion = '2.3.0.0' object IpHtmlPanel1: TIpHtmlPanel Left = 0 Height = 525 @@ -170,8 +170,8 @@ object FHtmFileExp1: TFHtmFileExp1 Width = 152 BorderSpacing.InnerBorder = 4 Caption = 'Open HTML File' - OnClick = B_OpenHTMLFileClick TabOrder = 0 + OnClick = B_OpenHTMLFileClick end end object OpenDialog1: TOpenDialog diff --git a/components/turbopower_ipro/examples/htmfileexp1.pas b/components/turbopower_ipro/examples/htmfileexp1.pas index f64c026c19..2041ac121a 100644 --- a/components/turbopower_ipro/examples/htmfileexp1.pas +++ b/components/turbopower_ipro/examples/htmfileexp1.pas @@ -2,7 +2,10 @@ unit HtmFileExp1; {$mode objfpc}{$H+} -{.$define UsePreview} +{$DEFINE HTML_Print} +{$IFDEF HTML_Print} + {$define UsePreview} +{$ENDIF} interface diff --git a/components/turbopower_ipro/examples/htmfileexplorer1.lpi b/components/turbopower_ipro/examples/htmfileexplorer1.lpi index b56c01f1e2..50774a942f 100644 --- a/components/turbopower_ipro/examples/htmfileexplorer1.lpi +++ b/components/turbopower_ipro/examples/htmfileexplorer1.lpi @@ -69,6 +69,9 @@ + + + diff --git a/components/turbopower_ipro/iphtmlpv.pas b/components/turbopower_ipro/iphtmlpv.pas index b299ef4a3e..fab82a2a2d 100644 --- a/components/turbopower_ipro/iphtmlpv.pas +++ b/components/turbopower_ipro/iphtmlpv.pas @@ -39,9 +39,9 @@ unit IpHtmlPv; interface uses - Types, Classes, SysUtils, + Classes, SysUtils, // LCL - LCLIntf, GraphType, Buttons, Messages, Graphics, Controls, Forms, + LCLIntf, LCLType, GraphType, Buttons, Messages, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, Spin, // TurboPower_ipro IpHtml, IpConst, IpHtmlTypes; diff --git a/examples/turbopower_ipro/mainunit.lfm b/examples/turbopower_ipro/mainunit.lfm index d4ec2cb749..9569b258f1 100644 --- a/examples/turbopower_ipro/mainunit.lfm +++ b/examples/turbopower_ipro/mainunit.lfm @@ -9,8 +9,8 @@ object MainForm: TMainForm Caption = 'Example for turbopower internet pro HTML control' ClientHeight = 327 ClientWidth = 569 + LCLVersion = '3.99.0.0' OnCreate = MainFormCreate - LCLVersion = '2.3.0.0' object IpHtmlPanel1: TIpHtmlPanel Left = 0 Height = 285 @@ -48,8 +48,8 @@ object MainForm: TMainForm Width = 152 BorderSpacing.InnerBorder = 4 Caption = 'Open HTML File' - OnClick = OpenHTMLFileButtonClick TabOrder = 0 + OnClick = OpenHTMLFileButtonClick end object Button1: TButton Left = 192 @@ -58,8 +58,8 @@ object MainForm: TMainForm Width = 75 BorderSpacing.InnerBorder = 4 Caption = 'Preview' - OnClick = Button1Click TabOrder = 1 + OnClick = Button1Click end end object OpenDialog1: TOpenDialog diff --git a/examples/turbopower_ipro/mainunit.pas b/examples/turbopower_ipro/mainunit.pas index 113b13d710..fa51ef0ab5 100644 --- a/examples/turbopower_ipro/mainunit.pas +++ b/examples/turbopower_ipro/mainunit.pas @@ -2,7 +2,9 @@ unit MainUnit; {$mode objfpc}{$H+} -{$define UsePreview} +{$if defined(Html_Print)} + {$define UsePreview} +{$endif} interface