pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

jvcllaz: Less hints and warnings.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7268 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-01-11 18:01:12 +00:00
parent 69ffb7cda8
commit 01f504ede7
7 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/jvcllaz/packages/jvcl_all.lpk
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Package Version="4">
<Package Version="5">
<PathDelim Value="\"/>
<Name Value="jvcl_all"/>
<Type Value="RunAndDesignTime"/>
@ -8,7 +8,7 @@
<Version Value="11"/>
<PathDelim Value="\"/>
<SearchPaths>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
<UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvAll"/>
</SearchPaths>
</CompilerOptions>
<Description Value="A meta package for simple installation of all JVCL designtime packages."/>

2
components/jvcllaz/packages/jvpascalinterpreterd.lpk
View File

@ -10,7 +10,7 @@
<PathDelim Value="\"/>
<SearchPaths>
<OtherUnitFiles Value="..\design\JvPascalInterpreter"/>
<UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
<UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvPascalInterpreter"/>
</SearchPaths>
</CompilerOptions>
<Description Value="Pascal scripting engine of the JVCL library (https://sourceforge.net/projects/jvcl/) (designime code)

2
components/jvcllaz/packages/jvpascalinterpreterr.lpk
View File

@ -9,7 +9,7 @@
<PathDelim Value="\"/>
<SearchPaths>
<OtherUnitFiles Value="..\run\JvPascalInterpreter"/>
<UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
<UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvPascalInterpreter"/>
</SearchPaths>
</CompilerOptions>
<Description Value="Pascal scripting engine of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code)

2
components/jvcllaz/run/JvCustomControls/jvcustomitemviewer.pas
View File

@ -309,7 +309,6 @@ type
procedure CustomSort(Compare:TListSortCompare);virtual;
function ClientDisplayRect: TRect;
class function GetControlClassDefaultSize: TSize; override;
{$IF LCL_FullVersion >= 1080000}
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double); override;
@ -353,6 +352,7 @@ type
function IndexOf(Item: TJvViewerItem): Integer;
function ItemAtPos(X, Y: Integer; Existing: Boolean): Integer; virtual;
function ItemRect(Index: Integer; IncludeSpacing: Boolean): TRect;
class function GetControlClassDefaultSize: TSize; override;
property BorderStyle default bsSingle;
end;

7
components/jvcllaz/run/JvCustomControls/jvgammapanel.pas
View File

@ -34,7 +34,7 @@ unit JvGammaPanel;
interface
uses
Types, SysUtils, Classes, Graphics, Controls, Dialogs, ExtCtrls, StdCtrls,
SysUtils, Classes, Graphics, Controls, Dialogs, ExtCtrls, StdCtrls,
JvTypes;
type
@ -56,8 +56,8 @@ type
FOnChangeColor: TJvChangeColorEvent;
procedure BgColorClick(Sender: TObject);
procedure ChangeColor(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure ColorSeek(Sender: TObject; Shift: TShiftState; X, Y: Integer);
{%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
procedure ColorSeek(Sender: TObject; {%H-}Shift: TShiftState; X, Y: Integer);
procedure Exchange(Sender: TObject);
procedure FgColorClick(Sender: TObject);
function GetBackgroundColor: TColor;
@ -380,7 +380,6 @@ var
imgSize: Integer;
p: Integer;
m: Integer;
hx: Integer;
begin
inherited;
if FPanel3 = nil then

2
components/jvcllaz/run/JvCustomControls/jvimagesviewer.pas
View File

@ -345,7 +345,7 @@ procedure TJvPictureItem.DoLoadProgress(Sender: TObject;
Stage: TFPImgProgressStage; PercentDone: Byte; RedrawNow: Boolean;
const R: TRect; const Msg: AnsiString; var Continue: Boolean);
begin
if Owner is TJvImagesViewer then
if Continue and (Owner is TJvImagesViewer) then
TJvImagesViewer(Owner).DoLoadProgress(Self, Stage, PercentDone, RedrawNow, R, Msg);
end;

49
components/jvcllaz/run/JvWizard/jvwizard.pas
View File

@ -714,14 +714,20 @@ type
procedure Done; virtual;
{ called just before the page is hidden. Page: To page }
procedure ExitPage(const ToPage: TJvWizardCustomPage); virtual; // renamed from Exit() to ExitPage
{ adaption of dimensions to screen dpi }
{ lcl scaling }
{$IF LCL_FullVersion >= 1080000}
protected
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double); override;
public
{$IF LCL_FullVersion >= 1080100}
procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
{$ELSEIF LCL_FullVersion >= 1080000}
{$ELSE}
procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF}
{$IFEND}
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -766,9 +772,11 @@ type
FWaterMark: TJvWizardWaterMark;
protected
procedure AdjustClientRect(var Rect: TRect); override;
procedure DrawPage(ACanvas: TCanvas; var ARect: TRect); override;
{$IF LCL_FullVersion >= 1080000}
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double); override;
procedure DrawPage(ACanvas: TCanvas; var ARect: TRect); override;
{$IFEND}
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -2217,21 +2225,6 @@ begin
FImage.PaintTo(ACanvas, R);
end;
end;
(*
procedure TJvWizardWaterMark.DoAutoAdjustLayout(
const AMode: TLayoutAdjustmentPolicy; const AXProportion, AYProportion: Double);
begin
inherited;
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
begin
BeginUpdate;
try
FWidth := Round(FWidth * AXProportion);
finally
EndUpdate;
end;
end;
end;*)
procedure TJvWizardWaterMark.ImageChanged(Sender: TObject);
begin
@ -2573,6 +2566,7 @@ begin
Header.Title := Value;
end;
{$IF LCL_FullVersion >= 1080000}
procedure TJvWizardCustomPage.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double);
begin
@ -2598,6 +2592,7 @@ begin
FPanel.BorderWidth := Round(FPanel.BorderWidth * AXProportion);
end;
end;
{$IFEND}
{$IF LCL_FullVersion >= 1080100}
procedure TJvWizardCustomPage.ScaleFontsPPI(const AToPPI: Integer;
@ -2649,6 +2644,7 @@ begin
end;
end;
{$IF LCL_FullVersion >= 1080000}
procedure TJvWizardWelcomePage.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double);
begin
@ -2661,6 +2657,7 @@ begin
FWatermark.BorderWidth := Round(FWaterMark.BorderWidth * AXProportion);
end;
end;
{$IFEND}
procedure TJvWizardWelcomePage.DrawPage(ACanvas: TCanvas; var ARect: TRect);
begin
@ -3384,20 +3381,4 @@ begin
FNavigateButtons[TJvWizardButtonKind(Index)] := Value;
end;
(*
procedure TJvWizard.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double);
begin
inherited;
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
begin
BeginUpdate;
try
finally
EndUpdate;
end;
end;
end;
*)
end.