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

jvcllaz: Check and fix compilation and examples for Laz 2.0.10/FPC 3.2.0

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7536 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-07-10 18:11:22 +00:00
parent d3b5ba9322
commit d26c738b03
15 changed files with 218 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/jvcllaz/examples/JvBehaviorLabel/JvBehaviorLabelDemo.lpi
View File

@ -4,6 +4,9 @@
<Version Value="12"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<Title Value="JvBehaviorLabelDemo"/> <Title Value="JvBehaviorLabelDemo"/>
<Scaled Value="True"/> <Scaled Value="True"/>
@ -14,8 +17,8 @@
</XPManifest> </XPManifest>
<Icon Value="0"/> <Icon Value="0"/>
</General> </General>
<BuildModes> <BuildModes Count="1">
<Item Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -23,7 +26,6 @@
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>
<Modes Count="0"/>
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="2">
<Item1> <Item1>
@ -33,18 +35,18 @@
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units> <Units Count="2">
<Unit> <Unit0>
<Filename Value="JvBehaviorLabelDemo.lpr"/> <Filename Value="JvBehaviorLabelDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit> </Unit0>
<Unit> <Unit1>
<Filename Value="JvBehaviorLblMainFrmU.pas"/> <Filename Value="JvBehaviorLblMainFrmU.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="JvBehaviorLblMainFrm"/> <ComponentName Value="JvBehaviorLblMainFrm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
</Unit> </Unit1>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>

41
components/jvcllaz/examples/JvImageTransform/JvImageTransformDemo.lpi
View File

@ -4,6 +4,9 @@
<Version Value="12"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<Title Value="JvImageTransformDemo"/> <Title Value="JvImageTransformDemo"/>
<Scaled Value="True"/> <Scaled Value="True"/>
@ -14,8 +17,8 @@
</XPManifest> </XPManifest>
<Icon Value="0"/> <Icon Value="0"/>
</General> </General>
<BuildModes> <BuildModes Count="1">
<Item Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -24,27 +27,27 @@
<RunParams> <RunParams>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>
</RunParams> </RunParams>
<RequiredPackages> <RequiredPackages Count="2">
<Item> <Item1>
<PackageName Value="JvMMLazR"/> <PackageName Value="JvMMLazR"/>
</Item> </Item1>
<Item> <Item2>
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item> </Item2>
</RequiredPackages> </RequiredPackages>
<Units> <Units Count="2">
<Unit> <Unit0>
<Filename Value="JvImageTransformDemo.lpr"/> <Filename Value="JvImageTransformDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit> </Unit0>
<Unit> <Unit1>
<Filename Value="jvimagetransformform.pas"/> <Filename Value="jvimagetransformform.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="MainForm"/> <ComponentName Value="MainForm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="JvImageTransformForm"/> <UnitName Value="JvImageTransformForm"/>
</Unit> </Unit1>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
@ -66,16 +69,16 @@
</Linking> </Linking>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions> <Exceptions Count="3">
<Item> <Item1>
<Name Value="EAbort"/> <Name Value="EAbort"/>
</Item> </Item1>
<Item> <Item2>
<Name Value="ECodetoolError"/> <Name Value="ECodetoolError"/>
</Item> </Item2>
<Item> <Item3>
<Name Value="EFOpenError"/> <Name Value="EFOpenError"/>
</Item> </Item3>
</Exceptions> </Exceptions>
</Debugging> </Debugging>
</CONFIG> </CONFIG>

45
components/jvcllaz/examples/JvInterpreterDemos/JvInterpreterCallFunction/JvInterpreterCallFunction.lpi
View File

@ -4,6 +4,9 @@
<Version Value="12"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<Title Value="JvInterpreterCallFunction"/> <Title Value="JvInterpreterCallFunction"/>
<Scaled Value="True"/> <Scaled Value="True"/>
@ -14,8 +17,8 @@
</XPManifest> </XPManifest>
<Icon Value="0"/> <Icon Value="0"/>
</General> </General>
<BuildModes> <BuildModes Count="1">
<Item Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -24,29 +27,29 @@
<RunParams> <RunParams>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>
</RunParams> </RunParams>
<RequiredPackages> <RequiredPackages Count="3">
<Item> <Item1>
<PackageName Value="SynEdit"/> <PackageName Value="SynEdit"/>
</Item> </Item1>
<Item> <Item2>
<PackageName Value="JvPascalInterpreterR"/> <PackageName Value="JvPascalInterpreterR"/>
</Item> </Item2>
<Item> <Item3>
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item> </Item3>
</RequiredPackages> </RequiredPackages>
<Units> <Units Count="2">
<Unit> <Unit0>
<Filename Value="JvInterpreterCallFunction.lpr"/> <Filename Value="JvInterpreterCallFunction.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit> </Unit0>
<Unit> <Unit1>
<Filename Value="JvInterpreterCallFunctionFm.pas"/> <Filename Value="JvInterpreterCallFunctionFm.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="Form1"/> <ComponentName Value="Form1"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
</Unit> </Unit1>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
@ -68,16 +71,16 @@
</Linking> </Linking>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions> <Exceptions Count="3">
<Item> <Item1>
<Name Value="EAbort"/> <Name Value="EAbort"/>
</Item> </Item1>
<Item> <Item2>
<Name Value="ECodetoolError"/> <Name Value="ECodetoolError"/>
</Item> </Item2>
<Item> <Item3>
<Name Value="EFOpenError"/> <Name Value="EFOpenError"/>
</Item> </Item3>
</Exceptions> </Exceptions>
</Debugging> </Debugging>
</CONFIG> </CONFIG>

125
components/jvcllaz/examples/JvInterpreterDemos/JvInterpreterCallFunction/JvInterpreterCallFunctionFm.lfm
View File

@ -1,13 +1,14 @@
object Form1: TForm1 object Form1: TForm1
Left = 450 Left = 369
Height = 690 Height = 690
Top = 165 Top = 140
Width = 965 Width = 965
Caption = 'Form1' Caption = 'JvInterpreter Call Function Demo'
ClientHeight = 690 ClientHeight = 690
ClientWidth = 965 ClientWidth = 965
Color = clBtnFace Color = clBtnFace
Font.Color = clWindowText Font.Color = clWindowText
OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
LCLVersion = '2.1.0.0' LCLVersion = '2.1.0.0'
object Label1: TLabel object Label1: TLabel
@ -23,117 +24,6 @@ object Form1: TForm1
Caption = 'Result:' Caption = 'Result:'
ParentColor = False ParentColor = False
end end
inline JvHLEditor1: TSynEdit
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Button2
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom
Left = 12
Height = 637
Top = 41
Width = 941
BorderSpacing.Left = 12
BorderSpacing.Top = 8
BorderSpacing.Right = 12
BorderSpacing.Bottom = 12
Anchors = [akTop, akLeft, akRight, akBottom]
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqCleartype
ParentColor = False
ParentFont = False
TabOrder = 0
Gutter.Width = 57
Gutter.MouseActions = <>
RightGutter.Width = 0
RightGutter.MouseActions = <>
Highlighter = SynPasSyn1
Keystrokes = <>
MouseActions = <>
MouseTextActions = <>
MouseSelActions = <>
Lines.Strings = (
'unit UserFunctions;'
''
'// sample of a user-created-library of jvinterpreter functions that your compiled'
'// program might access:'
''
''
'// notice that there is no interface/implementation section in this '
'// interpreter-only unit.'
''
'function MyFunction(B:String):Integer;'
'begin'
' result := Length(B);'
'end;'
''
'function MyFunction2(A,B:Integer):Integer;'
'begin'
' result := A+B;'
'end;'
''
''
'end.'
)
VisibleSpecialChars = [vscSpace, vscTabAtLast]
SelectedColor.BackPriority = 50
SelectedColor.ForePriority = 50
SelectedColor.FramePriority = 50
SelectedColor.BoldPriority = 50
SelectedColor.ItalicPriority = 50
SelectedColor.UnderlinePriority = 50
SelectedColor.StrikeOutPriority = 50
BracketHighlightStyle = sbhsBoth
BracketMatchColor.Background = clNone
BracketMatchColor.Foreground = clNone
BracketMatchColor.Style = [fsBold]
FoldedCodeColor.Background = clNone
FoldedCodeColor.Foreground = clGray
FoldedCodeColor.FrameColor = clGray
MouseLinkColor.Background = clNone
MouseLinkColor.Foreground = clBlue
LineHighlightColor.Background = clNone
LineHighlightColor.Foreground = clNone
inline SynLeftGutterPartList1: TSynGutterPartList
object SynGutterMarks1: TSynGutterMarks
Width = 24
MouseActions = <>
end
object SynGutterLineNumber1: TSynGutterLineNumber
Width = 17
MouseActions = <>
MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone
DigitCount = 2
ShowOnlyLineNumbersMultiplesOf = 1
ZeroStart = False
LeadingZeros = False
end
object SynGutterChanges1: TSynGutterChanges
Width = 4
MouseActions = <>
ModifiedColor = 59900
SavedColor = clGreen
end
object SynGutterSeparator1: TSynGutterSeparator
Width = 2
MouseActions = <>
MarkupInfo.Background = clWhite
MarkupInfo.Foreground = clGray
end
object SynGutterCodeFolding1: TSynGutterCodeFolding
MouseActions = <>
MarkupInfo.Background = clNone
MarkupInfo.Foreground = clGray
MouseActionsExpanded = <>
MouseActionsCollapsed = <>
end
end
end
object Button1: TButton object Button1: TButton
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
@ -146,7 +36,7 @@ object Form1: TForm1
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'Call MyFunction' Caption = 'Call MyFunction'
OnClick = Button1Click OnClick = Button1Click
TabOrder = 1 TabOrder = 0
end end
object Button2: TButton object Button2: TButton
AnchorSideLeft.Control = Button1 AnchorSideLeft.Control = Button1
@ -160,7 +50,7 @@ object Form1: TForm1
BorderSpacing.Left = 12 BorderSpacing.Left = 12
Caption = 'Call MyFunction2' Caption = 'Call MyFunction2'
OnClick = Button2Click OnClick = Button2Click
TabOrder = 2 TabOrder = 1
end end
object Edit1: TEdit object Edit1: TEdit
AnchorSideLeft.Control = Label1 AnchorSideLeft.Control = Label1
@ -173,7 +63,7 @@ object Form1: TForm1
Width = 121 Width = 121
BorderSpacing.Left = 12 BorderSpacing.Left = 12
ReadOnly = True ReadOnly = True
TabOrder = 3 TabOrder = 2
end end
object JvInterpreterProgram1: TJvInterpreterProgram object JvInterpreterProgram1: TJvInterpreterProgram
OnGetValue = JvInterpreterProgram1GetValue OnGetValue = JvInterpreterProgram1GetValue
@ -185,7 +75,6 @@ object Form1: TForm1
CommentAttri.Foreground = clTeal CommentAttri.Foreground = clTeal
CompilerMode = pcmDelphi CompilerMode = pcmDelphi
NestedComments = False NestedComments = False
TypeHelpers = True
left = 325 left = 325
top = 272 top = 272
end end

88
components/jvcllaz/examples/JvInterpreterDemos/JvInterpreterCallFunction/JvInterpreterCallFunctionFm.pas
View File

@ -3,17 +3,15 @@ unit JvInterpreterCallFunctionFm;
interface interface
uses uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, SysUtils, Variants, Classes, Graphics, Controls, Forms,
StdCtrls, Dialogs, SynEdit, SynHighlighterPas, //JvComponentBase, StdCtrls, Dialogs, SynEdit, SynHighlighterPas, LCLVersion,
JvInterpreter, JvExControls; JvInterpreter;
// JvEditorCommon, JvEditor, JvHLEditor;
type type
{ TForm1 } { TForm1 }
TForm1 = class(TForm) TForm1 = class(TForm)
JvHLEditor1: TSynEdit; //JvHLEditor;
Button1: TButton; Button1: TButton;
Button2: TButton; Button2: TButton;
Edit1: TEdit; Edit1: TEdit;
@ -21,6 +19,7 @@ type
JvInterpreterProgram1: TJvInterpreterProgram; JvInterpreterProgram1: TJvInterpreterProgram;
SynPasSyn1: TSynPasSyn; SynPasSyn1: TSynPasSyn;
procedure Button1Click(Sender: TObject); procedure Button1Click(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure JvInterpreterProgram1GetValue(Sender: TObject; procedure JvInterpreterProgram1GetValue(Sender: TObject;
Identifier: String; var Value: Variant; Args: TJvInterpreterArgs; Identifier: String; var Value: Variant; Args: TJvInterpreterArgs;
@ -28,6 +27,7 @@ type
procedure Button2Click(Sender: TObject); procedure Button2Click(Sender: TObject);
private private
{ Private declarations } { Private declarations }
JvHLEditor: TSynEdit;
public public
{ Public declarations } { Public declarations }
end; end;
@ -41,7 +41,7 @@ implementation
procedure TForm1.Button1Click(Sender: TObject); procedure TForm1.Button1Click(Sender: TObject);
var var
Args:TJvInterpreterArgs; Args: TJvInterpreterArgs;
begin begin
{ before we get here, JvInterpreterProgram1.Pas is already set to show the text in the HLEditor. } { before we get here, JvInterpreterProgram1.Pas is already set to show the text in the HLEditor. }
Assert(JvInterpreterProgram1.Pas.Count>0); Assert(JvInterpreterProgram1.Pas.Count>0);
@ -65,39 +65,85 @@ end;
procedure TForm1.FormShow(Sender: TObject); procedure TForm1.FormShow(Sender: TObject);
begin begin
{ move program text over to interpreter! } { move program text over to interpreter! }
JvInterpreterProgram1.Pas.Assign( JvHLEditor1.Lines ); JvInterpreterProgram1.Pas.Assign(JvHLEditor.Lines);
end; end;
procedure TForm1.JvInterpreterProgram1GetValue(Sender: TObject; procedure TForm1.JvInterpreterProgram1GetValue(Sender: TObject;
Identifier: String; var Value: Variant; Args: TJvInterpreterArgs; Identifier: String; var Value: Variant; Args: TJvInterpreterArgs;
var Done: Boolean); var Done: Boolean);
begin begin
Identifier := UpperCase(Identifier); Identifier := UpperCase(Identifier);
if (Identifier='LENGTH') and (ARgs.Count=1) and (VarIsStr(Args.Values[0])) then if (Identifier='LENGTH') and (ARgs.Count=1) and (VarIsStr(Args.Values[0])) then
begin begin
Value := Length(ARgs.Values[0]); Value := Length(ARgs.Values[0]);
Done := true; Done := true;
end; end;
end; end;
procedure TForm1.Button2Click(Sender: TObject); procedure TForm1.Button2Click(Sender: TObject);
var var
Param1,Param2,Param3:Variant; Param1,Param2:Variant;
begin begin
{ before we get here, JvInterpreterProgram1.Pas is already set to show the text in the HLEditor. } { before we get here, JvInterpreterProgram1.Pas is already set to show the text in the HLEditor. }
Assert(JvInterpreterProgram1.Pas.Count>0); Assert(JvInterpreterProgram1.Pas.Count>0);
{ Alternative method without creating/freeing JvInterpreter args is to use Params instead, but not Args:} { Alternative method without creating/freeing JvInterpreter args is to use Params instead, but not Args:}
Param1 := 10;
Param2 := 20;
JvInterpreterProgram1.CallFunction( 'MyFunction2', nil, [Param1,Param2] );
Param1 := 10; { show result to user:}
Param2 := 20;
JvInterpreterProgram1.CallFunction( 'MyFunction2', nil, [Param1,Param2] );
{ show result to user:}
Edit1.Text := VarToStr( JvInterpreterProgram1.VResult ); Edit1.Text := VarToStr( JvInterpreterProgram1.VResult );
end; end;
procedure TForm1.FormCreate(Sender: TObject);
begin
JvHLEditor := TSynEdit.Create(self);
with JvHLEditor do
begin
Parent := self;
AnchorSideLeft.Control := self;
AnchorSideTop.Control := Button2;
AnchorSideTop.Side := asrBottom;
AnchorSideRight.Control := self;
AnchorSideRight.Side := asrBottom;
AnchorSideBottom.Control := Self;
AnchorSideBottom.Side := asrBottom;
BorderSpacing.Left := 12;
BorderSpacing.Top := 8;
BorderSpacing.Right := 12;
BorderSpacing.Bottom := 12;
Anchors := [akTop, akLeft, akRight, akBottom];
Lines.Add('unit UserFunctions;');
Lines.Add('');
Lines.Add('// sample of a user-created-library of jvinterpreter functions that your compiled');
Lines.Add('// program might access:');
Lines.Add('');
Lines.Add('');
Lines.Add('// notice that there is no interface/implementation section in this ');
Lines.Add('// interpreter-only unit.');
Lines.Add('');
Lines.Add('function MyFunction(B:String):Integer;');
Lines.Add('begin');
Lines.Add(' result := Length(B);');
Lines.Add('end;');
Lines.Add('');
Lines.Add('function MyFunction2(A,B:Integer):Integer;');
Lines.Add('begin');
Lines.Add(' result := A+B;');
Lines.Add('end;');
Lines.Add('');
Lines.Add('');
Lines.Add('end.');
Highlighter := SynPasSyn1;
end;
{$IF LCL_FullVersion >= 2010000}
JvHLEditor.ScrollOnEditLeftOptions.ScrollExtraMax := 10;
JvHLEditor.ScrollOnEditLeftOptions.ScrollExtraPercent := 20;
SynPasSyn1.Typehelpers := true;
{$ENDIF}
end;
end. end.

45
components/jvcllaz/examples/JvInterpreterDemos/JvInterpreterSimple/JvInterpreterSimpleExpression.lpi
View File

@ -4,6 +4,9 @@
<Version Value="12"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<Title Value="JvInterpreterSimpleExpression"/> <Title Value="JvInterpreterSimpleExpression"/>
<Scaled Value="True"/> <Scaled Value="True"/>
@ -14,8 +17,8 @@
</XPManifest> </XPManifest>
<Icon Value="0"/> <Icon Value="0"/>
</General> </General>
<BuildModes> <BuildModes Count="1">
<Item Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -24,30 +27,30 @@
<RunParams> <RunParams>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>
</RunParams> </RunParams>
<RequiredPackages> <RequiredPackages Count="3">
<Item> <Item1>
<PackageName Value="JvCustomLazR"/> <PackageName Value="JvCustomLazR"/>
</Item> </Item1>
<Item> <Item2>
<PackageName Value="JvPascalInterpreterR"/> <PackageName Value="JvPascalInterpreterR"/>
<MaxVersion Major="1" Release="6"/> <MaxVersion Major="1" Release="6"/>
</Item> </Item2>
<Item> <Item3>
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item> </Item3>
</RequiredPackages> </RequiredPackages>
<Units> <Units Count="2">
<Unit> <Unit0>
<Filename Value="JvInterpreterSimpleExpression.lpr"/> <Filename Value="JvInterpreterSimpleExpression.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit> </Unit0>
<Unit> <Unit1>
<Filename Value="JvInterpreterSimpleExpressionFm.pas"/> <Filename Value="JvInterpreterSimpleExpressionFm.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="Form1"/> <ComponentName Value="Form1"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
</Unit> </Unit1>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
@ -69,16 +72,16 @@
</Linking> </Linking>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions> <Exceptions Count="3">
<Item> <Item1>
<Name Value="EAbort"/> <Name Value="EAbort"/>
</Item> </Item1>
<Item> <Item2>
<Name Value="ECodetoolError"/> <Name Value="ECodetoolError"/>
</Item> </Item2>
<Item> <Item3>
<Name Value="EFOpenError"/> <Name Value="EFOpenError"/>
</Item> </Item3>
</Exceptions> </Exceptions>
</Debugging> </Debugging>
</CONFIG> </CONFIG>

2
components/jvcllaz/examples/JvInterpreterDemos/JvInterpreterSimple/JvInterpreterSimpleExpression.lpr
View File

@ -9,7 +9,7 @@ uses
{$R *.res} {$R *.res}
begin begin
Application.Scaled := True; Application.Scaled:=True;
Application.Initialize; Application.Initialize;
Application.CreateForm(TForm1, Form1); Application.CreateForm(TForm1, Form1);
Application.Run; Application.Run;

12
components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi
View File

@ -89,14 +89,14 @@
<Unit7> <Unit7>
<Filename Value="..\..\run\JvCore\jvjclutils.pas"/> <Filename Value="..\..\run\JvCore\jvjclutils.pas"/>
<UnitName Value="JvJCLUtils"/> <UnitName Value="JvJCLUtils"/>
<EditorIndex Value="9"/> <EditorIndex Value="5"/>
<TopLine Value="1062"/> <TopLine Value="1062"/>
<CursorPos X="23" Y="1080"/> <CursorPos X="23" Y="1080"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
<Filename Value="c:\lazarus-trunk_fpc304\lcl\lcltype.pp"/> <Filename Value="C:\lazarus-trunk_fpc304\lcl\lcltype.pp"/>
<UnitName Value="LCLType"/> <UnitName Value="LCLType"/>
<EditorIndex Value="8"/> <EditorIndex Value="8"/>
<TopLine Value="230"/> <TopLine Value="230"/>
@ -105,7 +105,7 @@
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="c:\lazarus-trunk_fpc304\lcl\graphics.pp"/> <Filename Value="C:\lazarus-trunk_fpc304\lcl\graphics.pp"/>
<UnitName Value="Graphics"/> <UnitName Value="Graphics"/>
<EditorIndex Value="7"/> <EditorIndex Value="7"/>
<TopLine Value="1125"/> <TopLine Value="1125"/>
@ -116,14 +116,14 @@
<Unit10> <Unit10>
<Filename Value="..\..\run\JvCore\jvexcontrols.pas"/> <Filename Value="..\..\run\JvCore\jvexcontrols.pas"/>
<UnitName Value="JvExControls"/> <UnitName Value="JvExControls"/>
<EditorIndex Value="5"/> <EditorIndex Value="4"/>
<TopLine Value="237"/> <TopLine Value="237"/>
<CursorPos X="14" Y="254"/> <CursorPos X="14" Y="254"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit10> </Unit10>
<Unit11> <Unit11>
<Filename Value="c:\lazarus-trunk_fpc304\lcl\controls.pp"/> <Filename Value="C:\lazarus-trunk_fpc304\lcl\controls.pp"/>
<UnitName Value="Controls"/> <UnitName Value="Controls"/>
<EditorIndex Value="6"/> <EditorIndex Value="6"/>
<TopLine Value="162"/> <TopLine Value="162"/>
@ -133,7 +133,7 @@
</Unit11> </Unit11>
<Unit12> <Unit12>
<Filename Value="D:\lazarus202_fpc304_win64\fpc\3.0.4\source\rtl\inc\objpas.inc"/> <Filename Value="D:\lazarus202_fpc304_win64\fpc\3.0.4\source\rtl\inc\objpas.inc"/>
<EditorIndex Value="4"/> <EditorIndex Value="9"/>
<TopLine Value="537"/> <TopLine Value="537"/>
<CursorPos X="38" Y="550"/> <CursorPos X="38" Y="550"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>

18
components/jvcllaz/examples/JvPanel/JvPanelDemo.lpi
View File

@ -4,6 +4,9 @@
<Version Value="12"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<Title Value="JvPanelDemo"/> <Title Value="JvPanelDemo"/>
<Scaled Value="True"/> <Scaled Value="True"/>
@ -14,8 +17,8 @@
</XPManifest> </XPManifest>
<Icon Value="0"/> <Icon Value="0"/>
</General> </General>
<BuildModes> <BuildModes Count="1">
<Item Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -23,7 +26,6 @@
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>
<Modes Count="0"/>
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="2">
<Item1> <Item1>
@ -33,18 +35,18 @@
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units> <Units Count="2">
<Unit> <Unit0>
<Filename Value="JvPanelDemo.lpr"/> <Filename Value="JvPanelDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit> </Unit0>
<Unit> <Unit1>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="MainForm"/> <ComponentName Value="MainForm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
</Unit> </Unit1>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>

2
components/jvcllaz/examples/JvPicClip/main.lfm
View File

@ -8,7 +8,7 @@ object Form1: TForm1
ClientHeight = 213 ClientHeight = 213
ClientWidth = 320 ClientWidth = 320
OnCreate = FormCreate OnCreate = FormCreate
LCLVersion = '2.1.0.0' LCLVersion = '2.0.10.0'
object CombinedImage: TImage object CombinedImage: TImage
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner

34
components/jvcllaz/examples/JvPicClip/main.pas
View File

@ -97,20 +97,20 @@ var
begin begin
L := TStringList.Create; L := TStringList.Create;
try try
L.Add(FOLDER + 'JvMM/images/tjvbmpanimator.bmp'); //0 L.Add(FOLDER + 'JvMM/images/tjvbmpanimator.png'); //0
L.Add(FOLDER + 'JvMM/images/tjvfullcoloraxiscombo.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcoloraxiscombo.png');
L.Add(FOLDER + 'JvMM/images/tjvfullcolorcircle.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorcircle.png');
L.Add(FOLDER + 'JvMM/images/tjvfullcolorcircledialog.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorcircledialog.png');
L.Add(FOLDER + 'JvMM/images/tjvfullcolorgroup.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorgroup.png');
L.Add(FOLDER + 'JvMM/images/tjvfullcolorlabel.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorlabel.png');
L.Add(FOLDER + 'JvMM/images/tjvfullcolorpanel.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorpanel.png');
L.Add(FOLDER + 'JvMM/images/tjvfullcolorspacecombo.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorspacecombo.png');
L.Add(FOLDER + 'JvMM/images/tjvfullcolortrackbar.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolortrackbar.png');
L.Add(FOLDER + 'JvMM/images/tjvgradient.bmp'); L.Add(FOLDER + 'JvMM/images/tjvgradient.png');
L.Add(FOLDER + 'JvMM/images/tjvgradientheaderpanel.bmp'); // 10 L.Add(FOLDER + 'JvMM/images/tjvgradientheaderpanel.png'); // 10
L.Add(FOLDER + 'JvMM/images/tjvid3v2.bmp'); L.Add(FOLDER + 'JvMM/images/tjvid3v2.png');
L.Add(FOLDER + 'JvMM/images/tjvpicclip.bmp'); L.Add(FOLDER + 'JvMM/images/tjvpicclip.png');
L.Add(FOLDER + 'JvMM/images/tjvspecialprogress.bmp'); L.Add(FOLDER + 'JvMM/images/tjvspecialprogress.png');
L.Add(FOLDER + 'JvHMI/images/tjvdialbutton.bmp'); L.Add(FOLDER + 'JvHMI/images/tjvdialbutton.bmp');
L.Add(FOLDER + 'JvHMI/images/tjvled.bmp'); L.Add(FOLDER + 'JvHMI/images/tjvled.bmp');
L.Add(FOLDER + 'JvDB/images/tjvdbcalcedit.bmp'); L.Add(FOLDER + 'JvDB/images/tjvdbcalcedit.bmp');
@ -118,12 +118,12 @@ begin
L.Add(FOLDER + 'JvDB/images/tjvdbsearchcombobox.bmp'); L.Add(FOLDER + 'JvDB/images/tjvdbsearchcombobox.bmp');
L.Add(FOLDER + 'JvDB/images/tjvdbsearchedit.bmp'); L.Add(FOLDER + 'JvDB/images/tjvdbsearchedit.bmp');
L.Add(FOLDER + 'JvDB/images/tjvdbtreeview.bmp'); // 20 L.Add(FOLDER + 'JvDB/images/tjvdbtreeview.bmp'); // 20
L.Add(FOLDER + 'JvPageComps/images/tjvtabbar.bmp');
L.Add(FOLDER + 'JvPageComps/images/tjvmoderntabbarpainter.bmp');
L.Add(FOLDER + 'JvCustomControls/images/tjvownerdrawviewer.png');
L.Add(FOLDER + 'JvCustomControls/images/tjvimagelistviewer.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvimagelistviewer.png');
L.Add(FOLDER + 'JvCustomControls/images/tjvimagesviewer.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvimagesviewer.png');
L.Add(FOLDER + 'JvCustomControls/images/tjvmoderntabbarpainter.bmp');
L.Add(FOLDER + 'JvCustomControls/images/tjvoutlookbar.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvoutlookbar.png');
L.Add(FOLDER + 'JvCustomControls/images/tjvownerdrawviewer.png');
L.Add(FOLDER + 'JvCustomControls/images/tjvtabbar.bmp');
L.Add(FOLDER + 'JvCustomControls/images/tjvthumbimage.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvthumbimage.png');
L.Add(FOLDER + 'JvCustomControls/images/tjvthumbnail.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvthumbnail.png');
L.Add(FOLDER + 'JvCustomControls/images/tjvthumbview.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvthumbview.png');

41
components/jvcllaz/examples/JvSpecialImage/JvSpecialImageDemo.lpi
View File

@ -4,6 +4,9 @@
<Version Value="12"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<Title Value="JvSpecialImageDemo"/> <Title Value="JvSpecialImageDemo"/>
<Scaled Value="True"/> <Scaled Value="True"/>
@ -14,8 +17,8 @@
</XPManifest> </XPManifest>
<Icon Value="0"/> <Icon Value="0"/>
</General> </General>
<BuildModes> <BuildModes Count="1">
<Item Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -24,27 +27,27 @@
<RunParams> <RunParams>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>
</RunParams> </RunParams>
<RequiredPackages> <RequiredPackages Count="2">
<Item> <Item1>
<PackageName Value="JvMMLazR"/> <PackageName Value="JvMMLazR"/>
</Item> </Item1>
<Item> <Item2>
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item> </Item2>
</RequiredPackages> </RequiredPackages>
<Units> <Units Count="2">
<Unit> <Unit0>
<Filename Value="JvSpecialImageDemo.lpr"/> <Filename Value="JvSpecialImageDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit> </Unit0>
<Unit> <Unit1>
<Filename Value="jvspecialimagedemoform.pas"/> <Filename Value="jvspecialimagedemoform.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="Form1"/> <ComponentName Value="Form1"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="JvSpecialImageDemoForm"/> <UnitName Value="JvSpecialImageDemoForm"/>
</Unit> </Unit1>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
@ -66,16 +69,16 @@
</Linking> </Linking>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions> <Exceptions Count="3">
<Item> <Item1>
<Name Value="EAbort"/> <Name Value="EAbort"/>
</Item> </Item1>
<Item> <Item2>
<Name Value="ECodetoolError"/> <Name Value="ECodetoolError"/>
</Item> </Item2>
<Item> <Item3>
<Name Value="EFOpenError"/> <Name Value="EFOpenError"/>
</Item> </Item3>
</Exceptions> </Exceptions>
</Debugging> </Debugging>
</CONFIG> </CONFIG>

1
components/jvcllaz/run/JvMM/jvpicclip.pas
View File

@ -88,7 +88,6 @@ implementation
uses uses
SysUtils, SysUtils,
//Consts,
JvJVCLUtils, JvConsts; JvJVCLUtils, JvConsts;
constructor TJvPicClip.Create(AOwner: TComponent); constructor TJvPicClip.Create(AOwner: TComponent);

4
components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas
View File

@ -6120,7 +6120,7 @@ begin
if TVarData(Variable).VType = varArray then if TVarData(Variable).VType = varArray then
begin begin
{Get array value} {Get array value}
PP := PJvInterpreterArrayRec(NativeInt(JvInterpreterVarAsType(Variable, varInteger))); PP := PJvInterpreterArrayRec(PtrInt(JvInterpreterVarAsType(Variable, varInteger)));
if Args.Count > PP.Dimension then if Args.Count > PP.Dimension then
JvInterpreterError(ieArrayTooManyParams, -1) JvInterpreterError(ieArrayTooManyParams, -1)
else else
@ -6199,7 +6199,7 @@ begin
if TVarData(Variable).VType = varArray then if TVarData(Variable).VType = varArray then
begin begin
{ Get array value } { Get array value }
PP := PJvInterpreterArrayRec(NativeInt(JvInterpreterVarAsType(Variable, varInteger))); PP := PJvInterpreterArrayRec(PtrInt(JvInterpreterVarAsType(Variable, varInteger)));
if Args.Count > PP.Dimension then if Args.Count > PP.Dimension then
JvInterpreterError(ieArrayTooManyParams, -1) JvInterpreterError(ieArrayTooManyParams, -1)
else else

10
components/jvcllaz/run/JvPascalInterpreter/JvInterpreterFm.pas
View File

@ -144,7 +144,7 @@ var
implementation implementation
uses uses
TypInfo, LazFileUtils, Variants, TypInfo, LazFileUtils,
JvResources, JvTypes, JvJCLUtils; JvResources, JvTypes, JvJCLUtils;
@ -681,28 +681,28 @@ end;
procedure JvInterpreter_JvInterpreterRunFormModal(var Value: Variant; Args: TJvInterpreterArgs); procedure JvInterpreter_JvInterpreterRunFormModal(var Value: Variant; Args: TJvInterpreterArgs);
begin begin
Value := JvInterpreterRunFormModal(Args.Values[0]); Value := JvInterpreterRunFormModal(VarToStr(Args.Values[0]));
end; end;
{ function JvInterpreterRunForm(const FileName: TFileName): TForm; } { function JvInterpreterRunForm(const FileName: TFileName): TForm; }
procedure JvInterpreter_JvInterpreterRunForm(var Value: Variant; Args: TJvInterpreterArgs); procedure JvInterpreter_JvInterpreterRunForm(var Value: Variant; Args: TJvInterpreterArgs);
begin begin
Value := O2V(JvInterpreterRunForm(Args.Values[0])); Value := O2V(JvInterpreterRunForm(VarToStr(Args.Values[0])));
end; end;
{ function JvInterpreterMakeForm(const FileName: TFileName): TForm; } { function JvInterpreterMakeForm(const FileName: TFileName): TForm; }
procedure JvInterpreter_JvInterpreterMakeForm(var Value: Variant; Args: TJvInterpreterArgs); procedure JvInterpreter_JvInterpreterMakeForm(var Value: Variant; Args: TJvInterpreterArgs);
begin begin
Value := O2V(JvInterpreterMakeForm(Args.Values[0])); Value := O2V(JvInterpreterMakeForm(VarToStr(Args.Values[0])));
end; end;
{ function JvInterpreterRunUnit(const FileName: TFileName): Variant } { function JvInterpreterRunUnit(const FileName: TFileName): Variant }
procedure JvInterpreter_JvInterpreterRunUnit(var Value: Variant; Args: TJvInterpreterArgs); procedure JvInterpreter_JvInterpreterRunUnit(var Value: Variant; Args: TJvInterpreterArgs);
begin begin
Value := JvInterpreterRunUnit(Args.Values[0]); Value := JvInterpreterRunUnit(VarToStr(Args.Values[0]));
end; end;
procedure JvInterpreterRunReportPreview(const AFileName: string); procedure JvInterpreterRunReportPreview(const AFileName: string);