Skip to content

Commit 7774c92

Browse files
ver. 2.3.0
- Use of TFormTabsBar component (Delphi 12) for paging - Use of Styled Message Dialogs - Updated Setup to show errors registering dlls
1 parent 6ca7f6d commit 7774c92

File tree

195 files changed

+6183
-12222
lines changed

Some content is hidden

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

195 files changed

+6183
-12222
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/FRAMVIEW.DCR

-480 Bytes
Binary file not shown.

Ext/HTMLViewer/package/Frambrwz.dcr

-496 Bytes
Binary file not shown.

Ext/HTMLViewer/package/FrameViewer10_1.dpk

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)