Skip to content

Commit 1bfda28

Browse files
carloBarazzettacarloBarazzetta
committed
ver. 2.3.2
- Updated Packages to require correct HTMLViewer Packages Fixed #7
1 parent 0768921 commit 1bfda28

File tree

118 files changed

+5202
-412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+5202
-412
lines changed

‎Ext/HTMLViewer/Source/HTMLSubs.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1749,7 +1749,7 @@ ThtDocument = class(TCell) {a list of all the sections -- the html document}
17491749
function GetURL(Canvas: TCanvas; X, Y: Integer; out UrlTarg: TUrlTarget; out FormControl: TIDObject {TImageFormControlObj}; out ATitle: ThtString): ThtguResultType; override;
17501750
procedure CancelActives;
17511751
procedure CheckGIFList(Sender: TObject);
1752-
procedure Clear; virtual;
1752+
procedure Clear; {$ifndef Compiler34_Plus}override;{$endif}
17531753
procedure ClearLists;
17541754
procedure GetBackgroundImage;
17551755
procedure HideControls;
@@ -13411,7 +13411,7 @@ function TSection.Draw1(Canvas: TCanvas; const ARect: TRect;
1341113411
NewCP := True;
1341213412
CPy := Y + LR.DrawY; //Todo: Someone needs to find a sensible default value.
1341313413
CPx := X + LR.LineIndent;
13414-
{$IFNDEF Compiler32_Plus}CP1x := CPx;{$ENDIF}
13414+
{$IFNDEF Compiler31_Plus}CP1x := CPx;{$ENDIF}
1341513415
LR.DrawY := Y - LR.LineHt;
1341613416
LR.DrawXX := CPx;
1341713417
AdjustDrawRect( LR.DrawY, LR.DrawXX, LR.DrawWidth, LR.LineHt ); //>-- DZ 19.09.2012

‎Ext/HTMLViewer/Source/framview.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ TFrameBase = class(THtmlFrameBase) {base class for other classes}
378378
UnLoaded: Boolean;
379379
LocalCharSet: TFontCharset;
380380
LocalCodePage: TBuffCodePage;
381-
function GetPixelsPerInch: Integer; override;
381+
function GetPixelsPerInch: Integer; {$ifdef Compiler35_Plus}override;{$endif}
382382
procedure SetQuirksMode(const AValue: THtQuirksMode); virtual;
383383
procedure FVMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); virtual; abstract;
384384
procedure FVMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); virtual; abstract;

‎Ext/HTMLViewer/Source/htmlcons.inc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ are covered by separate copyright notices located in those modules.
5858
{ Identify Delphi Compiler Version:
5959
6060
# Compiler Version Compiler Defined Symbol Codename
61+
D29 Delphi 12 36 VER360 Athens
6162
D28 Delphi 11 35 VER350 Alexandria
6263
D27 Delphi 10.4 34 VER340 Sydney
6364
D26 Delphi 10.3 33 VER330 Rio
@@ -173,6 +174,10 @@ are covered by separate copyright notices located in those modules.
173174
{$define Compiler35_Plus}
174175
{$ifdef ver350}
175176
{$else}
177+
{$define Compiler36_Plus}
178+
{$ifdef ver360}
179+
{$else}
180+
{$endif}
176181
{$endif}
177182
{$endif}
178183
{$endif}

‎Ext/HTMLViewer/Source/htmlview.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5075,7 +5075,7 @@ function THtmlViewer.GetSelHtml: UTF8String;
50755075
LTML: ThtString;
50765076
C: ThtChar;
50775077
begin
5078-
{$IFNDEF Compiler32_Plus}C := #0;{$ENDIF} // valium for Delphi 2009+
5078+
{$IFNDEF Compiler31_Plus}C := #0;{$ENDIF} // valium for Delphi 2009+
50795079
LTML := htLowerCase(HTML);
50805080
repeat
50815081
I := Pos(Tag, LTML);

‎Ext/HTMLViewer/package/Rad Studio 10.1/FrameViewer.dpk‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
package FrameViewer;
2+
3+
{$R *.res}
4+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5+
{$ALIGN 8}
6+
{$ASSERTIONS ON}
7+
{$BOOLEVAL OFF}
8+
{$DEBUGINFO OFF}
9+
{$EXTENDEDSYNTAX ON}
10+
{$IMPORTEDDATA ON}
11+
{$IOCHECKS ON}
12+
{$LOCALSYMBOLS OFF}
13+
{$LONGSTRINGS ON}
14+
{$OPENSTRINGS ON}
15+
{$OPTIMIZATION ON}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO OFF}
19+
{$SAFEDIVIDE OFF}
20+
{$STACKFRAMES OFF}
21+
{$TYPEDADDRESS OFF}
22+
{$VARSTRINGCHECKS ON}
23+
{$WRITEABLECONST OFF}
24+
{$MINENUMSIZE 1}
25+
{$IMAGEBASE $400000}
26+
{$DEFINE RELEASE}
27+
{$ENDIF IMPLICITBUILDING}
28+
{$DESCRIPTION 'THtmlViewer, TFrameViewer, and TFrameBrowser'}
29+
{$LIBSUFFIX '240'}
30+
{$RUNONLY}
31+
{$IMPLICITBUILD ON}
32+
33+
requires
34+
rtl,
35+
vcl,
36+
vclimg,
37+
VclSmp;
38+
39+
contains
40+
BegaHtmlPrintPreviewForm in '..\..\source\BegaHtmlPrintPreviewForm.pas',
41+
BegaMetaFilePrinter in '..\..\source\BegaMetaFilePrinter.pas',
42+
BegaPreview in '..\..\source\BegaPreview.pas',
43+
BegaPreviewForm in '..\..\source\BegaPreviewForm.pas' {BegaCustomPrintPreviewForm},
44+
BegaPreviewPanel in '..\..\source\BegaPreviewPanel.pas',
45+
BegaScrollBox in '..\..\source\BegaScrollBox.pas',
46+
BegaZoom in '..\..\source\BegaZoom.pas',
47+
BuffConv in '..\..\source\BuffConv.pas',
48+
BuffConvArrays in '..\..\source\BuffConvArrays.pas',
49+
DitherUnit in '..\..\source\DitherUnit.pas',
50+
FramBrwz in '..\..\source\FramBrwz.pas',
51+
framview in '..\..\source\framview.pas',
52+
GDIPL2A in '..\..\source\GDIPL2A.pas',
53+
HSLUtils in '..\..\source\HSLUtils.pas',
54+
HtmlBuffer in '..\..\source\HtmlBuffer.pas',
55+
HtmlCaches in '..\..\source\HtmlCaches.pas',
56+
HtmlFonts in '..\..\source\HtmlFonts.pas',
57+
htmlgif1 in '..\..\source\htmlgif1.pas',
58+
HTMLGif2 in '..\..\source\HTMLGif2.pas',
59+
HtmlGlobals in '..\..\source\HtmlGlobals.pas',
60+
HtmlImages in '..\..\source\HtmlImages.pas',
61+
Htmlsbs1 in '..\..\source\Htmlsbs1.pas',
62+
HTMLSubs in '..\..\source\HTMLSubs.pas',
63+
HtmlSymb in '..\..\source\HtmlSymb.pas',
64+
HTMLUn2 in '..\..\source\HTMLUn2.pas',
65+
htmlview in '..\..\source\htmlview.pas',
66+
MetaFilePrinter in '..\..\source\MetaFilePrinter.pas',
67+
ReadHTML in '..\..\source\ReadHTML.pas',
68+
StylePars in '..\..\source\StylePars.pas',
69+
StyleTypes in '..\..\source\StyleTypes.pas',
70+
StyleUn in '..\..\source\StyleUn.pas',
71+
URLSubs in '..\..\source\URLSubs.pas',
72+
UrlConn in '..\..\Source\UrlConn.pas',
73+
HtmlPrinter in '..\..\source\HtmlPrinter.pas',
74+
vwPrint in '..\..\source\vwPrint.pas';
75+
76+
end.

‎Ext/HTMLViewer/package/Rad Studio 10.1/FrameViewer.dproj‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<ProjectGuid>{B89B1394-4313-455B-8E21-9B7B17D41185}</ProjectGuid>
4+
<MainSource>FrameViewer.dpk</MainSource>
5+
<Base>True</Base>
6+
<Config Condition="'$(Config)'==''">Release</Config>
7+
<TargetedPlatforms>3</TargetedPlatforms>
8+
<AppType>Package</AppType>
9+
<FrameworkType>VCL</FrameworkType>
10+
<ProjectVersion>18.4</ProjectVersion>
11+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
12+
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
14+
<Base>true</Base>
15+
</PropertyGroup>
16+
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
17+
<Cfg_1>true</Cfg_1>
18+
<CfgParent>Base</CfgParent>
19+
<Base>true</Base>
20+
</PropertyGroup>
21+
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
22+
<Cfg_2>true</Cfg_2>
23+
<CfgParent>Base</CfgParent>
24+
<Base>true</Base>
25+
</PropertyGroup>
26+
<PropertyGroup Condition="'$(Base)'!=''">
27+
<SanitizedProjectName>FrameViewer</SanitizedProjectName>
28+
<DCC_DcuOutput>..\..\Lib\D10_1\$(Platform)</DCC_DcuOutput>
29+
<DCC_Description>THtmlViewer, TFrameViewer, and TFrameBrowser</DCC_Description>
30+
<DCC_S>false</DCC_S>
31+
<DCC_DebugInformation>0</DCC_DebugInformation>
32+
<GenPackage>true</GenPackage>
33+
<DCC_K>false</DCC_K>
34+
<DCC_F>false</DCC_F>
35+
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
36+
<DCC_N>false</DCC_N>
37+
<GenDll>true</GenDll>
38+
<DCC_E>false</DCC_E>
39+
<DCC_ImageBase>00400000</DCC_ImageBase>
40+
<DllSuffix>240</DllSuffix>
41+
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
42+
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
43+
</PropertyGroup>
44+
<PropertyGroup Condition="'$(Cfg_1)'!=''">
45+
<DCC_DebugInformation>0</DCC_DebugInformation>
46+
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
47+
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Cfg_2)'!=''">
50+
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
51+
<DCC_Optimize>false</DCC_Optimize>
52+
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
53+
<DCC_DebugInformation>2</DCC_DebugInformation>
54+
<DCC_DebugDCUs>true</DCC_DebugDCUs>
55+
<DCC_LocalDebugSymbols>true</DCC_LocalDebugSymbols>
56+
</PropertyGroup>
57+
<ItemGroup>
58+
<DelphiCompile Include="$(MainSource)">
59+
<MainSource>MainSource</MainSource>
60+
</DelphiCompile>
61+
<DCCReference Include="rtl.dcp"/>
62+
<DCCReference Include="vcl.dcp"/>
63+
<DCCReference Include="vclimg.dcp"/>
64+
<DCCReference Include="VclSmp.dcp"/>
65+
<DCCReference Include="..\..\source\BegaHtmlPrintPreviewForm.pas"/>
66+
<DCCReference Include="..\..\source\BegaMetaFilePrinter.pas"/>
67+
<DCCReference Include="..\..\source\BegaPreview.pas"/>
68+
<DCCReference Include="..\..\source\BegaPreviewForm.pas">
69+
<Form>BegaCustomPrintPreviewForm</Form>
70+
</DCCReference>
71+
<DCCReference Include="..\..\source\BegaPreviewPanel.pas"/>
72+
<DCCReference Include="..\..\source\BegaScrollBox.pas"/>
73+
<DCCReference Include="..\..\source\BegaZoom.pas"/>
74+
<DCCReference Include="..\..\source\BuffConv.pas"/>
75+
<DCCReference Include="..\..\source\BuffConvArrays.pas"/>
76+
<DCCReference Include="..\..\source\DitherUnit.pas"/>
77+
<DCCReference Include="..\..\source\FramBrwz.pas"/>
78+
<DCCReference Include="..\..\source\framview.pas"/>
79+
<DCCReference Include="..\..\source\GDIPL2A.pas"/>
80+
<DCCReference Include="..\..\source\HSLUtils.pas"/>
81+
<DCCReference Include="..\..\source\HtmlBuffer.pas"/>
82+
<DCCReference Include="..\..\source\HtmlCaches.pas"/>
83+
<DCCReference Include="..\..\source\HtmlFonts.pas"/>
84+
<DCCReference Include="..\..\source\htmlgif1.pas"/>
85+
<DCCReference Include="..\..\source\HTMLGif2.pas"/>
86+
<DCCReference Include="..\..\source\HtmlGlobals.pas"/>
87+
<DCCReference Include="..\..\source\HtmlImages.pas"/>
88+
<DCCReference Include="..\..\source\Htmlsbs1.pas"/>
89+
<DCCReference Include="..\..\source\HTMLSubs.pas"/>
90+
<DCCReference Include="..\..\source\HtmlSymb.pas"/>
91+
<DCCReference Include="..\..\source\HTMLUn2.pas"/>
92+
<DCCReference Include="..\..\source\htmlview.pas"/>
93+
<DCCReference Include="..\..\source\MetaFilePrinter.pas"/>
94+
<DCCReference Include="..\..\source\ReadHTML.pas"/>
95+
<DCCReference Include="..\..\source\StylePars.pas"/>
96+
<DCCReference Include="..\..\source\StyleTypes.pas"/>
97+
<DCCReference Include="..\..\source\StyleUn.pas"/>
98+
<DCCReference Include="..\..\source\URLSubs.pas"/>
99+
<DCCReference Include="..\..\Source\UrlConn.pas"/>
100+
<DCCReference Include="..\..\source\HtmlPrinter.pas"/>
101+
<DCCReference Include="..\..\source\vwPrint.pas"/>
102+
<BuildConfiguration Include="Debug">
103+
<Key>Cfg_2</Key>
104+
<CfgParent>Base</CfgParent>
105+
</BuildConfiguration>
106+
<BuildConfiguration Include="Base">
107+
<Key>Base</Key>
108+
</BuildConfiguration>
109+
<BuildConfiguration Include="Release">
110+
<Key>Cfg_1</Key>
111+
<CfgParent>Base</CfgParent>
112+
</BuildConfiguration>
113+
</ItemGroup>
114+
<ProjectExtensions>
115+
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
116+
<Borland.ProjectType>Package</Borland.ProjectType>
117+
<BorlandProject>
118+
<Delphi.Personality>
119+
<Source>
120+
<Source Name="MainSource">FrameViewer.dpk</Source>
121+
</Source>
122+
<Excluded_Packages/>
123+
</Delphi.Personality>
124+
<Platforms>
125+
<Platform value="Android">False</Platform>
126+
<Platform value="iOSDevice32">False</Platform>
127+
<Platform value="iOSSimulator">False</Platform>
128+
<Platform value="Win32">True</Platform>
129+
<Platform value="Win64">True</Platform>
130+
</Platforms>
131+
</BorlandProject>
132+
<ProjectFileVersion>12</ProjectFileVersion>
133+
</ProjectExtensions>
134+
<Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
135+
</Project>

‎Ext/HTMLViewer/package/Rad Studio 10.1/HTMLViewerPackages10_1.groupproj‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<ProjectGuid>{136DF2F3-8DDE-416A-8E28-3CFB83D344A0}</ProjectGuid>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<Projects Include="FrameViewer.dproj">
7+
<Dependencies/>
8+
</Projects>
9+
<Projects Include="dclFrameViewer.dproj">
10+
<Dependencies/>
11+
</Projects>
12+
</ItemGroup>
13+
<ProjectExtensions>
14+
<Borland.Personality>Default.Personality.12</Borland.Personality>
15+
<Borland.ProjectType/>
16+
<BorlandProject>
17+
<Default.Personality/>
18+
</BorlandProject>
19+
</ProjectExtensions>
20+
<Target Name="FrameViewer">
21+
<MSBuild Projects="FrameViewer.dproj"/>
22+
</Target>
23+
<Target Name="FrameViewer:Clean">
24+
<MSBuild Projects="FrameViewer.dproj" Targets="Clean"/>
25+
</Target>
26+
<Target Name="FrameViewer:Make">
27+
<MSBuild Projects="FrameViewer.dproj" Targets="Make"/>
28+
</Target>
29+
<Target Name="dclFrameViewer">
30+
<MSBuild Projects="dclFrameViewer.dproj"/>
31+
</Target>
32+
<Target Name="dclFrameViewer:Clean">
33+
<MSBuild Projects="dclFrameViewer.dproj" Targets="Clean"/>
34+
</Target>
35+
<Target Name="dclFrameViewer:Make">
36+
<MSBuild Projects="dclFrameViewer.dproj" Targets="Make"/>
37+
</Target>
38+
<Target Name="Build">
39+
<CallTarget Targets="FrameViewer;dclFrameViewer"/>
40+
</Target>
41+
<Target Name="Clean">
42+
<CallTarget Targets="FrameViewer:Clean;dclFrameViewer:Clean"/>
43+
</Target>
44+
<Target Name="Make">
45+
<CallTarget Targets="FrameViewer:Make;dclFrameViewer:Make"/>
46+
</Target>
47+
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
48+
</Project>

‎Ext/HTMLViewer/package/Rad Studio 10.1/dclFrameViewer.dpk‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package dclFrameViewer;
2+
3+
{$R *.res}
4+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5+
{$ALIGN 8}
6+
{$ASSERTIONS ON}
7+
{$BOOLEVAL OFF}
8+
{$DEBUGINFO OFF}
9+
{$EXTENDEDSYNTAX ON}
10+
{$IMPORTEDDATA ON}
11+
{$IOCHECKS ON}
12+
{$LOCALSYMBOLS OFF}
13+
{$LONGSTRINGS ON}
14+
{$OPENSTRINGS ON}
15+
{$OPTIMIZATION ON}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO OFF}
19+
{$SAFEDIVIDE OFF}
20+
{$STACKFRAMES OFF}
21+
{$TYPEDADDRESS OFF}
22+
{$VARSTRINGCHECKS ON}
23+
{$WRITEABLECONST OFF}
24+
{$MINENUMSIZE 1}
25+
{$IMAGEBASE $400000}
26+
{$DEFINE RELEASE}
27+
{$ENDIF IMPLICITBUILDING}
28+
{$DESCRIPTION 'THtmlViewer, TFrameViewer, and TFrameBrowser'}
29+
{$LIBSUFFIX '240'}
30+
{$DESIGNONLY}
31+
{$IMPLICITBUILD ON}
32+
33+
requires
34+
designide,
35+
FrameViewer;
36+
37+
contains
38+
FrameViewerReg in '..\..\source\FrameViewerReg.pas',
39+
HTMLCompEdit in '..\..\source\HTMLCompEdit.pas';
40+
41+
end.

0 commit comments

Comments
 (0)