Skip to content

Commit

Permalink
Updated to version number 11.6
Browse files Browse the repository at this point in the history
  • Loading branch information
BerndGabriel committed Jun 30, 2015
1 parent 5cf9ffe commit 0f60542
Show file tree
Hide file tree
Showing 18 changed files with 38 additions and 32 deletions.
Binary file modified Demos/Compiled Framedemo/FrameDem.exe
Binary file not shown.
22 changes: 12 additions & 10 deletions Demos/Compiled Framedemo/readme2.htm
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,21 @@
</head>

<body>
<p CLASS="title">HTML Components, Version 11.5</p>
<p CLASS="subtitle">Copyright &copy; 1995-2008 by L. David Baldwin, 2008-2014 by the HtmlViewer Team <a href="#copyright" target="bot">See below</a></p>
<p CLASS="title">HTML Components, Version 11.6</p>
<p CLASS="subtitle">Copyright &copy; 1995-2008 by L. David Baldwin, 2008-2015 by the HtmlViewer Team <a href="#copyright" target="bot">See below</a></p>
<table ALIGN="center" WIDTH="90%">
<tr>
<td VALIGN="top" WIDTH="60%"> <a HREF="readme3.htm#What" TARGET="Bot">What are the HTML Viewer Components?</a>
<br>
<a HREF="readme3.htm#Files" TARGET="Bot">Files Supplied</a><br>
<a HREF="readme3.htm#InstallViewer" TARGET="Bot">Installing the HTML Components</a><br>
<a HREF="readme3.htm#InstallHelp" TARGET="Bot">Installing the Help File</a><br>
<td VALIGN="top" WIDTH="60%">
<a HREF="readme3.htm#What" TARGET="Bot">What are the HTML Viewer Components?</a><br>
<a HREF="readme3.htm#Files" TARGET="Bot">Files Supplied</a><br>
<a HREF="readme3.htm#InstallViewer" TARGET="Bot">Installing the HTML Components</a><br>
<a HREF="readme3.htm#InstallHelp" TARGET="Bot">Installing the Help File</a><br>
</td>
<td VALIGN="top"> <a HREF="readme3.htm#UnInstall" TARGET="Bot">UnInstalling the Components</a><br>
<a HREF="readme3.htm#Addresses" TARGET="Bot">Contacts and Addresses</a><br>
<a HREF="readme3.htm#Acknowledgements" TARGET="Bot">Acknowledgements</a><br>
<td VALIGN="top">
<br>
<a HREF="readme3.htm#UnInstall" TARGET="Bot">UnInstalling the Components</a><br>
<a HREF="readme3.htm#Addresses" TARGET="Bot">Contacts and Addresses</a><br>
<a HREF="readme3.htm#Acknowledgements" TARGET="Bot">Acknowledgements</a><br>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion Demos/Compiled Framedemo/readme3.htm
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
</tr>
</table>

<p CLASS="heading"><a NAME="Copyright"></a>Copyright &copy; 1995-2008 by L. David Baldwin, 2008-2014 by HtmlViewer Team</p>
<p CLASS="heading"><a NAME="Copyright"></a>Copyright &copy; 1995-2008 by L. David Baldwin, 2008-2015 by HtmlViewer Team</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
Expand Down
4 changes: 2 additions & 2 deletions Demos/Compiled Framedemo/tabltut3.htm
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ <H4 CLASS="heading"><A NAME="Headings">Rows and/or Columns may have headings</A>
</CODE></PRE>
</td>
<td>
<TABLE border="1" style="empty-cells=show">
<TABLE border="1" style="empty-cells=hide">
<TR>
<TD rowspan="2"></TD>
<TH COLSPAN="3">Days of Week</TH>
Expand All @@ -157,7 +157,7 @@ <H4 CLASS="heading"><A NAME="Headings">Rows and/or Columns may have headings</A>
</TR>
</TABLE>
<PRE><CODE>
&lt;table border="1" <font color=red>style="empty-cells=show"</font>&gt;
&lt;table border="1" <font color=red>style="empty-cells=hide"</font>&gt;
&lt;tr&gt;
&lt;td rowspan="2"&gt;&lt;/td&gt;
&lt;th colspan="3"&gt;Days of Week&lt;/th&gt;
Expand Down
Binary file modified Demos/Other Demos/FrameBrowserUsingICSv7/FrameBrowserIcs.exe
Binary file not shown.
Binary file modified Demos/Other Demos/FrameBrowserUsingICSv7/fbHelp.res
Binary file not shown.
Binary file not shown.
Binary file modified Demos/Other Demos/FrameBrowserUsingIndy10/fbHelp.RES
Binary file not shown.
Binary file modified HtmlHelp/THtmlViewer.chm
Binary file not shown.
4 changes: 2 additions & 2 deletions source/BuffConv.pas
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
HtmlViewer Version 11.5
Copyright (c) 2010-2014 by Bernd Gabriel
HtmlViewer Version 11.6
Copyright (c) 2010-2015 by Bernd Gabriel
This source module is based on code of CodeChangerDecode.pas written by SchwarzKopf-M (SchwarzKopf-M@yandex.ru)
and the source code library libiconv, which is published under the GNU Library General Public License.
Expand Down
4 changes: 2 additions & 2 deletions source/HTMLSubs.pas
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
Version 11.5
Version 11.6
Copyright (c) 1995-2008 by L. David Baldwin
Copyright (c) 2008-2014 by HtmlViewer Team
Copyright (c) 2008-2015 by HtmlViewer Team
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
6 changes: 3 additions & 3 deletions source/HTMLUn2.pas
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
Version 11.5
Version 11.6
Copyright (c) 1995-2008 by L. David Baldwin
Copyright (c) 2008-2014 by HtmlViewer Team
Copyright (c) 2008-2015 by HtmlViewer Team
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down Expand Up @@ -57,7 +57,7 @@ interface
HtmlSymb;

const
VersionNo = '11.5';
VersionNo = '11.6';
MaxHScroll = 100000; {max horizontal display in pixels}
Tokenleng = 300;
TopLim = -200; {drawing limits}
Expand Down
4 changes: 2 additions & 2 deletions source/HtmlGlobals.pas
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
Version 11.5
Copyright (c) 2008-2014 by HtmlViewer Team
Version 11.6
Copyright (c) 2008-2015 by HtmlViewer Team
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
4 changes: 2 additions & 2 deletions source/HtmlImages.pas
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
Version 11.5
Version 11.6
Copyright (c) 1995-2008 by L. David Baldwin,
Copyright (c) 2008-2014 by HtmlViewer Team
Copyright (c) 2008-2015 by HtmlViewer Team
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
4 changes: 2 additions & 2 deletions source/ReadHTML.pas
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
Version 11.5
Version 11.6
Copyright (c) 1995-2008 by L. David Baldwin,
Copyright (c) 2008-2014 by HtmlViewer Team
Copyright (c) 2008-2015 by HtmlViewer Team
*********************************************************
* *
Expand Down
4 changes: 2 additions & 2 deletions source/StyleTypes.pas
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
Version 11.5
Version 11.6
Copyright (c) 1995-2008 by L. David Baldwin
Copyright (c) 2008-2010 by HtmlViewer Team
Copyright (c) 2011-2014 by Bernd Gabriel
Copyright (c) 2011-2015 by Bernd Gabriel
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
4 changes: 2 additions & 2 deletions source/StyleUn.pas
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
Version 11.5
Version 11.6
Copyright (c) 1995-2008 by L. David Baldwin,
Copyright (c) 2008-2014 by HtmlViewer Team
Copyright (c) 2008-2015 by HtmlViewer Team
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
8 changes: 6 additions & 2 deletions source/htmlview.pas
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
Version 11.5
Version 11.6
Copyright (c) 1995-2008 by L. David Baldwin
Copyright (c) 2008-2014 by HtmlViewer Team
Copyright (c) 2008-2015 by HtmlViewer Team
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down Expand Up @@ -1078,9 +1078,11 @@ procedure THtmlViewer.LoadFromFile(const FileName: ThtString; DocType: ThtmlFile
begin
if IsProcessing then
Exit;
{$ifdef FPC}
// in lazarus 1.4.0 with fpc 2.6.4
// htmlviewer will not draw properly if focused
RemoveFocus(false);
{$endif}
if Filename <> '' then
begin
OldFile := FCurrentFile;
Expand Down Expand Up @@ -1176,9 +1178,11 @@ procedure THtmlViewer.LoadDocument(Document: TBuffer; const DocName: ThtString;
begin
if IsProcessing then
Exit;
{$ifdef FPC}
// in lazarus 1.4.0 with fpc 2.6.4
// htmlviewer will not draw properly if focused
RemoveFocus(false);
{$endif}
SplitDest(DocName, Name, Dest);
case DocType of
ImgType:
Expand Down

0 comments on commit 0f60542

Please sign in to comment.