jvcllaz: Check packages and demos for Laz 1.8.4 / 2.0.0 / 2.0.2 / trunk and FPC 3.0.4 / FPC 3.2 / trunk. 32-bit, Laz 2.0.2/FPC 3.2 64 bit. Make fixes needed.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6971 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-05-29 23:35:34 +00:00
parent 35b4753bbc
commit a67a3f9d55
89 changed files with 441 additions and 327 deletions

View File

@ -102,7 +102,7 @@ begin
Strings.AddObject( Strings.AddObject(
Format('%s - %s', Format('%s - %s',
[ID3_FrameIDToString(lFrameID), TFSDesigner(FSDesigner).FrameDescription[lFrameID]]), [ID3_FrameIDToString(lFrameID), TFSDesigner(FSDesigner).FrameDescription[lFrameID]]),
TObject(lFrameID)); TObject(PtrInt(lFrameID)));
finally finally
Strings.EndUpdate; Strings.EndUpdate;
end; end;
@ -128,7 +128,7 @@ function TJvID3DefineDlg.GetFrameID: TJvID3FrameID;
begin begin
with cmbFrames do with cmbFrames do
if ItemIndex >= 0 then if ItemIndex >= 0 then
Result := TJvID3FrameID(Items.Objects[ItemIndex]) Result := TJvID3FrameID(PtrInt(Items.Objects[ItemIndex]))
else else
Result := fiUnknownFrame; Result := fiUnknownFrame;
end; end;

View File

@ -62,7 +62,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\TimeLineDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/TimeLineDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags> <Flags>
<UseDefaultCompilerOptions Value="True"/> <CompatibilityMode Value="True"/>
</Flags> </Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="BmpAnimDemo"/> <Title Value="BmpAnimDemo"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -45,7 +44,9 @@
<Unit1> <Unit1>
<Filename Value="BmpAnimMainFormU.pas"/> <Filename Value="BmpAnimMainFormU.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="BmpAnimMainForm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
</Unit1> </Unit1>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
@ -53,9 +54,10 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="BmpAnimDemo"/> <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\BmpAnimDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Linking> <Linking>

View File

@ -8,6 +8,7 @@ uses
{$R *.res} {$R *.res}
begin begin
Application.Scaled:=True;
Application.Initialize; Application.Initialize;
Application.CreateForm(TBmpAnimMainForm, BmpAnimMainForm); Application.CreateForm(TBmpAnimMainForm, BmpAnimMainForm);
Application.Run; Application.Run;

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="JvCheckBoxDemo"/> <Title Value="JvCheckBoxDemo"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -43,6 +45,7 @@
<Filename Value="jvcheckboxdemounit.pas"/> <Filename Value="jvcheckboxdemounit.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="Form1"/> <ComponentName Value="Form1"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="JvCheckBoxDemoUnit"/> <UnitName Value="JvCheckBoxDemoUnit"/>
</Unit1> </Unit1>
@ -52,7 +55,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvCheckBoxDemo"/> <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvCheckBoxDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -63,12 +63,26 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvComboListBoxDemo"/> <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvComboListBoxDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Parsing>
<SyntaxOptions>
<IncludeAssertionCode Value="True"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<Checks>
<IOChecks Value="True"/>
<RangeChecks Value="True"/>
<OverflowChecks Value="True"/>
<StackChecks Value="True"/>
</Checks>
<VerifyObjMethodCallValidity Value="True"/>
</CodeGeneration>
<Linking> <Linking>
<Options> <Options>
<Win32> <Win32>

View File

@ -56,7 +56,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvDBLookupDemo"/> <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDBLookupDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -56,7 +56,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvDBLookupTreeViewDemo"/> <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDBLookupTreeViewDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="JvSearchEditDemo"/> <Title Value="JvSearchEditDemo"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
<UseXPManifest Value="True"/> <UseXPManifest Value="True"/>
@ -52,7 +54,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvSearchEditDemo"/> <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvSearchEditDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="JVDBTreeViewDemo"/> <Title Value="JVDBTreeViewDemo"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -13,7 +15,6 @@
<XPManifest> <XPManifest>
<DpiAware Value="True"/> <DpiAware Value="True"/>
</XPManifest> </XPManifest>
<Icon Value="0"/>
</General> </General>
<BuildModes Count="1"> <BuildModes Count="1">
<Item1 Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
@ -58,7 +59,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvDBTreeViewDemo"/> <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDBTreeViewDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -17,6 +17,7 @@ begin
{$IFDEF LCLVersion >= 1080000} {$IFDEF LCLVersion >= 1080000}
Application.Scaled := True; Application.Scaled := True;
{$ENDIF} {$ENDIF}
Application.Scaled:=True;
Application.Initialize; Application.Initialize;
Application.CreateForm(TForm1, Form1); Application.CreateForm(TForm1, Form1);
Application.Run; Application.Run;

View File

@ -231,7 +231,7 @@
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit25> </Unit25>
<Unit26> <Unit26>
<Filename Value="C:\lazarus-trunk_fpc304\lcl\forms.pp"/> <Filename Value="c:\lazarus-trunk_fpc304\lcl\forms.pp"/>
<UnitName Value="Forms"/> <UnitName Value="Forms"/>
<EditorIndex Value="8"/> <EditorIndex Value="8"/>
<TopLine Value="1737"/> <TopLine Value="1737"/>
@ -247,7 +247,7 @@
<UsageCount Value="12"/> <UsageCount Value="12"/>
</Unit27> </Unit27>
<Unit28> <Unit28>
<Filename Value="C:\lazarus-trunk_fpc304\lcl\include\control.inc"/> <Filename Value="c:\lazarus-trunk_fpc304\lcl\include\control.inc"/>
<EditorIndex Value="3"/> <EditorIndex Value="3"/>
<TopLine Value="3305"/> <TopLine Value="3305"/>
<CursorPos Y="3324"/> <CursorPos Y="3324"/>
@ -255,7 +255,7 @@
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit28> </Unit28>
<Unit29> <Unit29>
<Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/> <Filename Value="c:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/>
<EditorIndex Value="4"/> <EditorIndex Value="4"/>
<TopLine Value="8121"/> <TopLine Value="8121"/>
<CursorPos Y="8145"/> <CursorPos Y="8145"/>
@ -263,7 +263,7 @@
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit29> </Unit29>
<Unit30> <Unit30>
<Filename Value="C:\lazarus-trunk_fpc304\lcl\lclmessageglue.pas"/> <Filename Value="c:\lazarus-trunk_fpc304\lcl\lclmessageglue.pas"/>
<UnitName Value="LCLMessageGlue"/> <UnitName Value="LCLMessageGlue"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<TopLine Value="102"/> <TopLine Value="102"/>
@ -399,7 +399,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\jvDesignerDemo"/> <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDesignerDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -55,7 +55,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvDialButtonDemo"/> <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDialButtonDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -53,7 +53,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/JvFormAnimations_Demo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFormAnimations_Demo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -54,7 +54,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/JvFormWallpaper_Demo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFormWallpaper_Demo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -101,7 +101,7 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm
object JvFullColorCircleDialog: TJvFullColorCircleDialog object JvFullColorCircleDialog: TJvFullColorCircleDialog
HelpContext = 0 HelpContext = 0
OnApply = JvFullColorCircleDialogApply OnApply = JvFullColorCircleDialogApply
left = 184 Left = 184
top = 80 Top = 80
end end
end end

View File

@ -92,7 +92,7 @@ procedure TJvFullColorCircleDlgMainFrm.FormCreate(Sender: TObject);
var var
LSearchRec: TSearchRec; LSearchRec: TSearchRec;
begin begin
ImgDir := IncludeTrailingPathDelimiter(GetCurrentDir) + '../design/JvCtrls/images/'; ImgDir := IncludeTrailingPathDelimiter(GetCurrentDir) + '../../design/JvCtrls/images/';
if FindFirst(ImgDir + '*.png', faAnyFile, LSearchRec) = 0 then if FindFirst(ImgDir + '*.png', faAnyFile, LSearchRec) = 0 then
repeat repeat
ComboBoxFileName.Items.Add(LSearchRec.Name); ComboBoxFileName.Items.Add(LSearchRec.Name);

View File

@ -54,13 +54,16 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/JvFullColorCircleDialogPrj"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFullColorCircleDialogPrj"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Linking> <Linking>
<Debugging>
<UseExternalDbgSyms Value="True"/>
</Debugging>
<Options> <Options>
<Win32> <Win32>
<GraphicApplication Value="True"/> <GraphicApplication Value="True"/>

View File

@ -11,7 +11,7 @@ object JvFullColorDialogMainFrm: TJvFullColorDialogMainFrm
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.1.0.0' LCLVersion = '2.0.2.0'
Visible = True Visible = True
object JvFullColorLabel: TJvFullColorLabel object JvFullColorLabel: TJvFullColorLabel
Left = 16 Left = 16

View File

@ -165,7 +165,7 @@ begin
with TJvFullColorLabel(Sender) do with TJvFullColorLabel(Sender) do
begin begin
JvFullColorDialog.FullColor := LabelColor; JvFullColorDialog.FullColor := LabelColor;
JvFullColorDialog.Tag := Integer(Sender); JvFullColorDialog.Tag := PtrInt(Sender);
if JvFullColorDialog.Execute then if JvFullColorDialog.Execute then
begin begin
LabelColor := JvFullColorDialog.FullColor; LabelColor := JvFullColorDialog.FullColor;

View File

@ -53,7 +53,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/JvFullColorDialogPrj"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFullColorDialogPrj"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -60,7 +60,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvHTCtrlsDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvHTCtrlsDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -66,7 +66,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvHTMLTest"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvHTMLTest"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -7,7 +7,7 @@ object MainForm: TMainForm
ClientHeight = 384 ClientHeight = 384
ClientWidth = 858 ClientWidth = 858
OnShow = FormShow OnShow = FormShow
LCLVersion = '2.1.0.0' LCLVersion = '2.0.2.0'
object PageControl: TPageControl object PageControl: TPageControl
Left = 0 Left = 0
Height = 384 Height = 384
@ -136,7 +136,7 @@ object MainForm: TMainForm
Font.Height = -13 Font.Height = -13
Font.Name = 'Courier New' Font.Name = 'Courier New'
Font.Pitch = fpFixed Font.Pitch = fpFixed
Font.Quality = fqAntialiased Font.Quality = fqCleartype
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="JvHtmlParserProj"/> <Title Value="JvHtmlParserProj"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -52,7 +54,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvHtmlParserProj"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvHtmlParserProj"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -53,7 +53,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvID3v1Demo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvID3v1Demo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -18,7 +18,7 @@ object JvID3v1MainForm: TJvID3v1MainForm
OnDropFiles = FormDropFiles OnDropFiles = FormDropFiles
Position = poScreenCenter Position = poScreenCenter
ShowHint = True ShowHint = True
LCLVersion = '2.1.0.0' LCLVersion = '1.8.4.0'
object lblArtist: TLabel object lblArtist: TLabel
AnchorSideTop.Control = edtArtist AnchorSideTop.Control = edtArtist
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter

View File

@ -224,7 +224,7 @@ var
begin begin
if JvId3v11.FileName > '' then if JvId3v11.FileName > '' then
begin begin
{ Store TagPresent in variabele to prevent double checks whether the file { Store TagPresent in variable to prevent double checks whether the file
has a tag } has a tag }
HasTag := JvId3v11.HasTag; HasTag := JvId3v11.HasTag;
lblHasTag.Font.Color := CHasTagColor[HasTag]; lblHasTag.Font.Color := CHasTagColor[HasTag];

View File

@ -60,7 +60,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvId3v2Demo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvId3v2Demo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -12,7 +12,7 @@ object JvID3v2EditForm: TJvID3v2EditForm
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
Position = poMainFormCenter Position = poMainFormCenter
LCLVersion = '2.1.0.0' LCLVersion = '2.0.2.0'
object lsbNavigator: TListBox object lsbNavigator: TListBox
Left = 4 Left = 4
Height = 479 Height = 479

View File

@ -502,7 +502,7 @@ begin
with Frame do with Frame do
begin begin
with cmbPictureType do with cmbPictureType do
PictureType := TJvID3PictureType(Items.Objects[ItemIndex]); PictureType := TJvID3PictureType(PtrInt(Items.Objects[ItemIndex]));
Description := edtPictureName.Text; Description := edtPictureName.Text;
MIMEType := AnsiString(ExtToMIMEType(ExtractFileExt(FileName))); MIMEType := AnsiString(ExtToMIMEType(ExtractFileExt(FileName)));
LoadFromFile(FileName); LoadFromFile(FileName);
@ -571,7 +571,7 @@ begin
begin begin
edtPictureName.Text := Frame.Description; edtPictureName.Text := Frame.Description;
with cmbPictureType do with cmbPictureType do
ItemIndex := Items.IndexOfObject(TObject(Frame.PictureType)); ItemIndex := Items.IndexOfObject(TObject(PtrInt(Frame.PictureType)));
end; end;
imgPicture.Picture.Assign(Frame); imgPicture.Picture.Assign(Frame);
@ -590,7 +590,7 @@ begin
try try
Strings.Clear; Strings.Clear;
for PictureType := Low(TJvID3PictureType) to High(TJvID3PictureType) do for PictureType := Low(TJvID3PictureType) to High(TJvID3PictureType) do
Strings.AddObject(CPictureTypeStr[PictureType], TObject(PictureType)); Strings.AddObject(CPictureTypeStr[PictureType], TObject(PtrInt(PictureType)));
finally finally
Strings.EndUpdate; Strings.EndUpdate;
end; end;
@ -640,7 +640,7 @@ begin
with Frame do with Frame do
begin begin
with cmbPictureType do with cmbPictureType do
PictureType := TJvID3PictureType(Items.Objects[ItemIndex]); PictureType := TJvID3PictureType(PtrInt(Items.Objects[ItemIndex]));
Description := edtPictureName.Text; Description := edtPictureName.Text;
lsvPictures.Items.BeginUpdate; lsvPictures.Items.BeginUpdate;

View File

@ -57,7 +57,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\Install2LabelDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/Install2LabelDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -1,59 +1,24 @@
object InstallLabelMainForm: TInstallLabelMainForm object InstallLabelMainForm: TInstallLabelMainForm
Left = 339 Left = 339
Height = 237 Height = 226
Top = 142 Top = 142
Width = 293 Width = 293
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
BorderStyle = bsSingle BorderStyle = bsSingle
Caption = 'Installation in progress' Caption = 'Installation in progress'
ClientHeight = 237 ClientHeight = 226
ClientWidth = 293 ClientWidth = 293
Color = clBtnFace Color = clForm
DefaultMonitor = dmDesktop DefaultMonitor = dmDesktop
KeyPreview = True KeyPreview = True
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.1.0.0' LCLVersion = '1.8.4.0'
Scaled = False Scaled = False
object Image1: TImage
Left = 8
Height = 32
Top = 8
Width = 32
AutoSize = True
Picture.Data = {
055449636F6EFE0200000000010001002020100001001000E802000016000000
2800000020000000400000000100040000000000800200000000000000000000
0000000000000000000000000000800000800000008080008000000080008000
80800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00
FFFF0000FFFFFF00000000000000000000000000000000000000000000000000
00000000000000000000000000BBBBBB000000000000000000000000BBB0000B
BB000000000000000000000BB00000000BBB0000000000000000000BB0000000
0BBB000000000000000000BBBB0000000BBBB00000000000000000BBBB000000
00BBBB0000000000000000BBBBB0000000BBBB0000000000000000BBBBB00000
00BBBB0000000000000000BBBBB0000000BBBB00000000000000000BBB000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB00000000000000000000000000BBBBBBB00000000000000000000000BB
BBBBBBBBBB000000000000000000000000000000000000000000000000000000
0000000000000000FFFFFFFFFFFFFFFFFFC0FFFFFF1E3FFFFE7F8FFFFE7F8FFF
FC3F87FFFC3FC3FFFC1FC3FFFC1FC3FFFC1FC3FFFE3FC3FFFFFFC3FFFFFFC3FF
FFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FF
FFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFF01FFFFFC003F
FFFFFFFFFFFFFFFF
}
Transparent = True
end
object Next: TButton object Next: TButton
Left = 121 Left = 128
Height = 25 Height = 25
Top = 204 Top = 192
Width = 75 Width = 75
Caption = '&Next >>' Caption = '&Next >>'
Default = True Default = True
@ -61,9 +26,9 @@ object InstallLabelMainForm: TInstallLabelMainForm
TabOrder = 0 TabOrder = 0
end end
object Button1: TButton object Button1: TButton
Left = 201 Left = 208
Height = 25 Height = 25
Top = 204 Top = 192
Width = 75 Width = 75
Caption = 'Close' Caption = 'Close'
OnClick = Button1Click OnClick = Button1Click
@ -71,22 +36,19 @@ object InstallLabelMainForm: TInstallLabelMainForm
end end
object Panel1: TPanel object Panel1: TPanel
Left = 8 Left = 8
Height = 146 Height = 144
Top = 48 Top = 40
Width = 276 Width = 276
BevelOuter = bvLowered BevelOuter = bvLowered
ClientHeight = 146 ClientHeight = 144
ClientWidth = 276 ClientWidth = 276
TabOrder = 2 TabOrder = 2
object InstallLabel1: TJvInstallLabel object InstallLabel1: TJvInstallLabel
Left = 1 Left = 1
Height = 144 Height = 142
Top = 1 Top = 1
Width = 274 Width = 274
Align = alClient Align = alClient
Font.CharSet = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -13
Images = ImageList1 Images = ImageList1
Lines.Strings = ( Lines.Strings = (
'Install JCL' 'Install JCL'
@ -95,11 +57,58 @@ object InstallLabelMainForm: TInstallLabelMainForm
'Compile JVCL packages' 'Compile JVCL packages'
'Install JVCL into Delphi IDE' 'Install JVCL into Delphi IDE'
) )
ParentFont = False
TextOffset = 40 TextOffset = 40
ImageOffset = 8 ImageOffset = 8
end end
end end
object Panel2: TPanel
Left = 0
Height = 34
Top = 0
Width = 293
Align = alTop
BevelOuter = bvNone
ClientHeight = 34
ClientWidth = 293
Color = clGray
ParentColor = False
TabOrder = 3
object Image1: TImage
Left = 0
Height = 32
Top = 0
Width = 32
AutoSize = True
Picture.Data = {
055449636F6EFE0200000000010001002020100001001000E802000016000000
2800000020000000400000000100040000000000800200000000000000000000
0000000000000000000000000000800000800000008080008000000080008000
80800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00
FFFF0000FFFFFF00000000000000000000000000000000000000000000000000
00000000000000000000000000BBBBBB000000000000000000000000BBB0000B
BB000000000000000000000BB00000000BBB0000000000000000000BB0000000
0BBB000000000000000000BBBB0000000BBBB00000000000000000BBBB000000
00BBBB0000000000000000BBBBB0000000BBBB0000000000000000BBBBB00000
00BBBB0000000000000000BBBBB0000000BBBB00000000000000000BBB000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB0000000000000000000000000000BBBB00000000000000000000000000
00BBBB00000000000000000000000000BBBBBBB00000000000000000000000BB
BBBBBBBBBB000000000000000000000000000000000000000000000000000000
0000000000000000FFFFFFFFFFFFFFFFFFC0FFFFFF1E3FFFFE7F8FFFFE7F8FFF
FC3F87FFFC3FC3FFFC1FC3FFFC1FC3FFFC1FC3FFFE3FC3FFFFFFC3FFFFFFC3FF
FFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FF
FFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFF01FFFFFC003F
FFFFFFFFFFFFFFFF
}
Transparent = True
end
end
object ImageList1: TImageList object ImageList1: TImageList
left = 48 left = 48
top = 8 top = 8

View File

@ -32,9 +32,12 @@ interface
uses uses
LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
StdCtrls, ExtCtrls, ImgList, JvInstallLabel; StdCtrls, ExtCtrls, JvInstallLabel;
type type
{ TInstallLabelMainForm }
TInstallLabelMainForm = class(TForm) TInstallLabelMainForm = class(TForm)
ImageList1: TImageList; ImageList1: TImageList;
Next: TButton; Next: TButton;
@ -42,6 +45,7 @@ type
Image1: TImage; Image1: TImage;
Panel1: TPanel; Panel1: TPanel;
InstallLabel1: TJvInstallLabel; InstallLabel1: TJvInstallLabel;
Panel2: TPanel;
procedure NextClick(Sender: TObject); procedure NextClick(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure Button1Click(Sender: TObject); procedure Button1Click(Sender: TObject);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags> <Flags>
@ -9,9 +9,9 @@
<MainUnitHasCreateFormStatements Value="False"/> <MainUnitHasCreateFormStatements Value="False"/>
<MainUnitHasTitleStatement Value="False"/> <MainUnitHasTitleStatement Value="False"/>
<MainUnitHasScaledStatement Value="False"/> <MainUnitHasScaledStatement Value="False"/>
<CompatibilityMode Value="True"/>
</Flags> </Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="JvItemViewerDemo"/> <Title Value="JvItemViewerDemo"/>
<UseAppBundle Value="False"/> <UseAppBundle Value="False"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -65,6 +65,9 @@
<CompilerOptions> <CompilerOptions>
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target>
<Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvItemViewerDemo"/>
</Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
@ -76,6 +79,9 @@
</SyntaxOptions> </SyntaxOptions>
</Parsing> </Parsing>
<Linking> <Linking>
<Debugging>
<UseExternalDbgSyms Value="True"/>
</Debugging>
<Options> <Options>
<Win32> <Win32>
<GraphicApplication Value="True"/> <GraphicApplication Value="True"/>

View File

@ -53,7 +53,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvLEDDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvLEDDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -54,7 +54,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvLookupAutoCompleteDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvLookupAutoCompleteDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -55,7 +55,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\MarkupDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/MarkupDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="12"/> <Version Value="10"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags> <Flags>
<LRSInOutputDirectory Value="False"/> <LRSInOutputDirectory Value="False"/>
<CompatibilityMode Value="True"/>
</Flags> </Flags>
<MainUnit Value="0"/>
</General> </General>
<BuildModes Count="1"> <BuildModes Count="1">
<Item1 Name="default" Default="True"/> <Item1 Name="default" Default="True"/>
@ -16,14 +16,9 @@
<Version Value="2"/> <Version Value="2"/>
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<FormatVersion Value="2"/> <local>
<Modes Count="1"> <FormatVersion Value="1"/>
<Mode0 Name="default"> </local>
<local>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local>
</Mode0>
</Modes>
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="2">
<Item1> <Item1>
@ -33,10 +28,11 @@
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units Count="12"> <Units Count="14">
<Unit0> <Unit0>
<Filename Value="JvNavPaneDemo.lpr"/> <Filename Value="JvNavPaneDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<CursorPos X="36" Y="11"/> <CursorPos X="36" Y="11"/>
<UsageCount Value="23"/> <UsageCount Value="23"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@ -48,10 +44,9 @@
<ComponentName Value="JvNavPaneDemoMainFrm"/> <ComponentName Value="JvNavPaneDemoMainFrm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<TopLine Value="258"/> <TopLine Value="310"/>
<CursorPos X="22" Y="280"/> <CursorPos X="40" Y="423"/>
<UsageCount Value="23"/> <UsageCount Value="23"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -85,15 +80,14 @@
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<UnitName Value="JvNavigationPane"/> <UnitName Value="JvNavigationPane"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<TopLine Value="199"/> <TopLine Value="25"/>
<CursorPos X="56" Y="216"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit6> </Unit6>
<Unit7> <Unit7>
<Filename Value="..\..\run\JvCore\jvjclutils.pas"/> <Filename Value="..\..\run\JvCore\jvjclutils.pas"/>
<UnitName Value="JvJCLUtils"/> <UnitName Value="JvJCLUtils"/>
<EditorIndex Value="7"/> <EditorIndex Value="9"/>
<TopLine Value="1062"/> <TopLine Value="1062"/>
<CursorPos X="23" Y="1080"/> <CursorPos X="23" Y="1080"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
@ -102,7 +96,7 @@
<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="6"/> <EditorIndex Value="8"/>
<TopLine Value="230"/> <TopLine Value="230"/>
<CursorPos X="3" Y="248"/> <CursorPos X="3" Y="248"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
@ -111,7 +105,7 @@
<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="5"/> <EditorIndex Value="7"/>
<TopLine Value="1125"/> <TopLine Value="1125"/>
<CursorPos X="14" Y="1141"/> <CursorPos X="14" Y="1141"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
@ -120,7 +114,7 @@
<Unit10> <Unit10>
<Filename Value="..\..\run\JvCore\jvexcontrols.pas"/> <Filename Value="..\..\run\JvCore\jvexcontrols.pas"/>
<UnitName Value="JvExControls"/> <UnitName Value="JvExControls"/>
<EditorIndex Value="3"/> <EditorIndex Value="5"/>
<TopLine Value="237"/> <TopLine Value="237"/>
<CursorPos X="14" Y="254"/> <CursorPos X="14" Y="254"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
@ -129,131 +123,154 @@
<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="4"/> <EditorIndex Value="6"/>
<TopLine Value="162"/> <TopLine Value="162"/>
<CursorPos X="3" Y="180"/> <CursorPos X="3" Y="180"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit11> </Unit11>
<Unit12>
<Filename Value="D:\lazarus202_fpc304_win64\fpc\3.0.4\source\rtl\inc\objpas.inc"/>
<EditorIndex Value="4"/>
<TopLine Value="537"/>
<CursorPos X="38" Y="550"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit12>
<Unit13>
<Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/>
<UnitName Value="JvPageList"/>
<EditorIndex Value="3"/>
<TopLine Value="447"/>
<CursorPos X="37" Y="461"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit13>
</Units> </Units>
<JumpHistory Count="28" HistoryIndex="27"> <JumpHistory Count="29" HistoryIndex="28">
<Position1> <Position1>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="2415" Column="83" TopLine="2397"/> <Caret Line="3787" Column="24" TopLine="3769"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="JvNavPaneDemoMainForm.pas"/>
<Caret Line="2420" Column="31" TopLine="2391"/> <Caret Line="286" Column="29" TopLine="264"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="2374" TopLine="2374"/> <Caret Line="645" Column="28" TopLine="618"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="JvNavPaneDemoMainForm.pas"/>
<Caret Line="280" Column="22" TopLine="258"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="2415" Column="80" TopLine="2386"/> <Caret Line="3434" Column="40" TopLine="3425"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="3539" Column="26" TopLine="3509"/> <Caret Line="3443" Column="23" TopLine="3424"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="JvNavPaneDemoMainForm.pas"/>
<Caret Line="3548" Column="3" TopLine="3515"/> <Caret Line="274" Column="34" TopLine="258"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="JvNavPaneDemoMainForm.pas"/>
<Caret Line="3540" Column="83" TopLine="3523"/> <Caret Line="57" Column="54" TopLine="39"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="JvNavPaneDemoMainForm.pas"/>
<Caret Line="3539" Column="60" TopLine="3522"/> <Caret Line="438" Column="3" TopLine="435"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="JvNavPaneDemoMainForm.pas"/>
<Caret Line="3541" Column="13" TopLine="3522"/> <Caret Line="57" Column="15" TopLine="39"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="JvNavPaneDemoMainForm.pas"/>
<Caret Line="3546" Column="13" TopLine="3522"/> <Caret Line="423" Column="40" TopLine="415"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="3788" Column="51" TopLine="3757"/> <Caret Line="2190" Column="37" TopLine="2182"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="4414" Column="17" TopLine="4385"/> <Caret Line="2197" Column="65" TopLine="2182"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="4901" Column="80" TopLine="4901"/> <Caret Line="2201" TopLine="2181"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="2250" TopLine="2229"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="2415" Column="79" TopLine="2386"/> <Caret Line="2265" TopLine="2233"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="D:\lazarus202_fpc304_win64\fpc\3.0.4\source\rtl\inc\objpas.inc"/>
<Caret Line="3541" Column="13" TopLine="3511"/> <Caret Line="550" Column="38" TopLine="537"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="3546" Column="13" TopLine="3516"/> <Caret Line="2262" Column="35" TopLine="2233"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="3787" Column="13" TopLine="3757"/> <Caret Line="2265" TopLine="2233"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="4414" Column="17" TopLine="4385"/> <Caret Line="2250" TopLine="2233"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="JvNavPaneDemoMainForm.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="252" Column="29" TopLine="252"/> <Caret Line="2265" TopLine="2233"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="JvNavPaneDemoMainForm.pas"/> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/>
<Caret Line="264" Column="15" TopLine="252"/> <Caret Line="2238" Column="31" TopLine="2233"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="JvNavPaneDemoMainForm.pas"/>
<Caret Line="3787" Column="24" TopLine="3769"/> <Caret Line="423" Column="40" TopLine="310"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="JvNavPaneDemoMainForm.pas"/> <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/>
<Caret Line="286" Column="29" TopLine="264"/> <Caret Line="94" Column="14" TopLine="76"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/>
<Caret Line="645" Column="28" TopLine="618"/> <Caret Line="81" Column="15" TopLine="76"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="JvNavPaneDemoMainForm.pas"/> <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/>
<Caret Line="280" Column="22" TopLine="258"/> <Caret Line="437" Column="3" TopLine="434"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/>
<Caret Line="3434" Column="40" TopLine="3425"/> <Caret Line="93" Column="17" TopLine="62"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/>
<Caret Line="3443" Column="23" TopLine="3424"/> <Caret Line="322" Column="3" TopLine="320"/>
</Position28> </Position28>
<Position29>
<Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/>
<Caret Line="79" Column="16" TopLine="75"/>
</Position29>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvNavPaneDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvNavPaneDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="..\..\resources"/> <IncludeFiles Value="..\..\resources"/>

View File

@ -8,7 +8,7 @@ object JvNavPaneDemoMainFrm: TJvNavPaneDemoMainFrm
Caption = 'JvNavigationPane Demo' Caption = 'JvNavigationPane Demo'
DockSite = True DockSite = True
OnCreate = FormCreate OnCreate = FormCreate
LCLVersion = '2.1.0.0' LCLVersion = '2.0.2.0'
object PopupMenu1: TPopupMenu object PopupMenu1: TPopupMenu
OnPopup = PopupMenu1Popup OnPopup = PopupMenu1Popup
left = 92 left = 92

View File

@ -430,9 +430,6 @@ begin
NT.CloseButton := ShowCloseButton1.Checked; NT.CloseButton := ShowCloseButton1.Checked;
end; end;
type
THackForm = class(TCustomForm);
procedure TJvNavPaneDemoMainFrm.DoToolEndDock(Sender, Target: TObject; X, Y: Integer); procedure TJvNavPaneDemoMainFrm.DoToolEndDock(Sender, Target: TObject; X, Y: Integer);
begin begin
if (Target is TCustomForm) and (Target <> Self) then if (Target is TCustomForm) and (Target <> Self) then

View File

@ -53,7 +53,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/OLBarDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/OLBarDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -55,7 +55,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/JvOutlookBarCustomDrawDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvOutlookBarCustomDrawDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -54,12 +54,26 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvPicClipDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvPicClipDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Parsing>
<SyntaxOptions>
<IncludeAssertionCode Value="True"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<Checks>
<IOChecks Value="True"/>
<RangeChecks Value="True"/>
<OverflowChecks Value="True"/>
<StackChecks Value="True"/>
</Checks>
<VerifyObjMethodCallValidity Value="True"/>
</CodeGeneration>
<Linking> <Linking>
<Options> <Options>
<Win32> <Win32>

View File

@ -64,7 +64,7 @@ object Form1: TForm1
ParentColor = False ParentColor = False
end end
object JvPicClip1: TJvPicClip object JvPicClip1: TJvPicClip
left = 96 Left = 96
top = 32 Top = 32
end end
end end

View File

@ -87,6 +87,8 @@ end;
procedure TForm1.CreateCombinedImage(ABitmap: TBitmap; procedure TForm1.CreateCombinedImage(ABitmap: TBitmap;
out ANumCols, ANumRows: Integer); out ANumCols, ANumRows: Integer);
const
FOLDER = '../../design/';
var var
pic: TPicture; pic: TPicture;
c, r, i: Integer; c, r, i: Integer;
@ -95,39 +97,39 @@ var
begin begin
L := TStringList.Create; L := TStringList.Create;
try try
L.Add('../design/JvMM/images/tjvbmpanimator.bmp'); //0 L.Add(FOLDER + 'JvMM/images/tjvbmpanimator.bmp'); //0
L.Add('../design/JvMM/images/tjvfullcoloraxiscombo.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcoloraxiscombo.bmp');
L.Add('../design/JvMM/images/tjvfullcolorcircle.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorcircle.bmp');
L.Add('../design/JvMM/images/tjvfullcolorcircledialog.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorcircledialog.bmp');
L.Add('../design/JvMM/images/tjvfullcolorgroup.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorgroup.bmp');
L.Add('../design/JvMM/images/tjvfullcolorlabel.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorlabel.bmp');
L.Add('../design/JvMM/images/tjvfullcolorpanel.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorpanel.bmp');
L.Add('../design/JvMM/images/tjvfullcolorspacecombo.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolorspacecombo.bmp');
L.Add('../design/JvMM/images/tjvfullcolortrackbar.bmp'); L.Add(FOLDER + 'JvMM/images/tjvfullcolortrackbar.bmp');
L.Add('../design/JvMM/images/tjvgradient.bmp'); L.Add(FOLDER + 'JvMM/images/tjvgradient.bmp');
L.Add('../design/JvMM/images/tjvgradientheaderpanel.bmp'); // 10 L.Add(FOLDER + 'JvMM/images/tjvgradientheaderpanel.bmp'); // 10
L.Add('../design/JvMM/images/tjvid3v2.bmp'); L.Add(FOLDER + 'JvMM/images/tjvid3v2.bmp');
L.Add('../design/JvMM/images/tjvpicclip.bmp'); L.Add(FOLDER + 'JvMM/images/tjvpicclip.bmp');
L.Add('../design/JvMM/images/tjvspecialprogress.bmp'); L.Add(FOLDER + 'JvMM/images/tjvspecialprogress.bmp');
L.Add('../design/JvHMI/images/tjvdialbutton.bmp'); L.Add(FOLDER + 'JvHMI/images/tjvdialbutton.bmp');
L.Add('../design/JvHMI/images/tjvled.bmp'); L.Add(FOLDER + 'JvHMI/images/tjvled.bmp');
L.Add('../design/JvDB/images/tjvdbcalcedit.bmp'); L.Add(FOLDER + 'JvDB/images/tjvdbcalcedit.bmp');
L.Add('../design/JvDB/images/tjvdbhtlabel.bmp'); L.Add(FOLDER + 'JvDB/images/tjvdbhtlabel.bmp');
L.Add('../design/JvDB/images/tjvdbsearchcombobox.bmp'); L.Add(FOLDER + 'JvDB/images/tjvdbsearchcombobox.bmp');
L.Add('../design/JvDB/images/tjvdbsearchedit.bmp'); L.Add(FOLDER + 'JvDB/images/tjvdbsearchedit.bmp');
L.Add('../design/JvDB/images/tjvdbtreeview.bmp'); // 20 L.Add(FOLDER + 'JvDB/images/tjvdbtreeview.bmp'); // 20
L.Add('../design/JvCustomControls/images/tjvimagelistviewer.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvimagelistviewer.png');
L.Add('../design/JvCustomControls/images/tjvimagesviewer.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvimagesviewer.png');
L.Add('../design/JvCustomControls/images/tjvmoderntabbarpainter.bmp'); L.Add(FOLDER + 'JvCustomControls/images/tjvmoderntabbarpainter.bmp');
L.Add('../design/JvCustomControls/images/tjvoutlookbar.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvoutlookbar.png');
L.Add('../design/JvCustomControls/images/tjvownerdrawviewer.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvownerdrawviewer.png');
L.Add('../design/JvCustomControls/images/tjvtabbar.bmp'); L.Add(FOLDER + 'JvCustomControls/images/tjvtabbar.bmp');
L.Add('../design/JvCustomControls/images/tjvthumbimage.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvthumbimage.png');
L.Add('../design/JvCustomControls/images/tjvthumbnail.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvthumbnail.png');
L.Add('../design/JvCustomControls/images/tjvthumbview.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvthumbview.png');
L.Add('../design/JvCustomControls/images/tjvtimeline.png'); // 30 L.Add(FOLDER + 'JvCustomControls/images/tjvtimeline.png'); // 30
L.Add('../design/JvCustomControls/images/tjvtmtimeline.png'); L.Add(FOLDER + 'JvCustomControls/images/tjvtmtimeline.png');
L.Add('../design/JvCustomControls/images/tjvvalidateedit.png'); // 32 L.Add(FOLDER + 'JvCustomControls/images/tjvvalidateedit.png'); // 32
ANumCols := 8; ANumCols := 8;
ANumRows := 4; ANumRows := 4;

View File

@ -54,7 +54,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/ProfilerDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/ProfilerDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="10"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
@ -13,18 +13,17 @@
<XPManifest> <XPManifest>
<DpiAware Value="True"/> <DpiAware Value="True"/>
</XPManifest> </XPManifest>
<Icon Value="0"/>
</General> </General>
<BuildModes Count="1"> <BuildModes Count="1">
<Item1 Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<UseFileFilters Value="True"/>
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<FormatVersion Value="2"/> <local>
<Modes Count="0"/> <FormatVersion Value="1"/>
</local>
</RunParams> </RunParams>
<RequiredPackages Count="1"> <RequiredPackages Count="1">
<Item1> <Item1>
@ -49,7 +48,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvRollOutDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvRollOutDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -14,7 +14,7 @@ object Form1: TForm1
Menu = MainMenu1 Menu = MainMenu1
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.1.0.0' LCLVersion = '1.8.4.0'
Scaled = False Scaled = False
object Splitter1: TSplitter object Splitter1: TSplitter
Cursor = crSizeWE Cursor = crSizeWE

View File

@ -6,8 +6,8 @@ interface
uses uses
SysUtils, Classes, Graphics, Controls, Forms, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, ExtCtrls, JvRollOut, ImgList, Dialogs, ExtCtrls, StdCtrls, ActnList, Menus,
StdCtrls, ActnList, Menus; //, JvExtComponent; JvRollOut;
type type
TForm1 = class(TForm) TForm1 = class(TForm)

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="JvSimScopeDemo"/> <Title Value="JvSimScopeDemo"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -13,7 +15,6 @@
<XPManifest> <XPManifest>
<DpiAware Value="True"/> <DpiAware Value="True"/>
</XPManifest> </XPManifest>
<Icon Value="0"/>
</General> </General>
<BuildModes Count="1"> <BuildModes Count="1">
<Item1 Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
@ -51,7 +52,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvSimScopeDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvSimScopeDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -52,7 +52,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/specialprogress_demo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/specialprogress_demo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="JvSpellCheckerDemo"/> <Title Value="JvSpellCheckerDemo"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -13,7 +15,6 @@
<XPManifest> <XPManifest>
<DpiAware Value="True"/> <DpiAware Value="True"/>
</XPManifest> </XPManifest>
<Icon Value="0"/>
</General> </General>
<BuildModes Count="1"> <BuildModes Count="1">
<Item1 Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
@ -41,7 +42,10 @@
<Unit1> <Unit1>
<Filename Value="jvspellcheckerform.pas"/> <Filename Value="jvspellcheckerform.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="frmSpellChecker"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="JvSpellCheckerForm"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="mainfrm.pas"/> <Filename Value="mainfrm.pas"/>
@ -56,7 +60,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvSpellCheckerDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvSpellCheckerDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -11,6 +11,7 @@ begin
{$IF LCL_FullVersion >= 1080000} {$IF LCL_FullVersion >= 1080000}
Application.Scaled := True; Application.Scaled := True;
{$ENDIF} {$ENDIF}
Application.Scaled:=True;
Application.Initialize; Application.Initialize;
Application.CreateForm(TfrmMain, frmMain); Application.CreateForm(TfrmMain, frmMain);
Application.CreateForm(TfrmSpellChecker, frmSpellChecker); Application.CreateForm(TfrmSpellChecker, frmSpellChecker);

View File

@ -15,7 +15,7 @@ object frmSpellChecker: TfrmSpellChecker
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
Position = poMainFormCenter Position = poMainFormCenter
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
Scaled = False Scaled = False
object Label1: TLabel object Label1: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
@ -253,8 +253,8 @@ object frmSpellChecker: TfrmSpellChecker
end end
object alSpell: TActionList object alSpell: TActionList
OnUpdate = alSpellUpdate OnUpdate = alSpellUpdate
left = 112 Left = 112
top = 144 Top = 144
object acIgnore: TAction object acIgnore: TAction
Caption = '&Ignore' Caption = '&Ignore'
OnExecute = acIgnoreExecute OnExecute = acIgnoreExecute

View File

@ -123,14 +123,15 @@ begin
end; end;
procedure TfrmSpellChecker.FormCreate(Sender: TObject); procedure TfrmSpellChecker.FormCreate(Sender: TObject);
var S:string; var
S:string;
begin begin
ASpellChecker := TJvSpellChecker.Create(self); ASpellChecker := TJvSpellChecker.Create(self);
// Dictionaries are plain text files, one word per row, preferably sorted. // Dictionaries are plain text files, one word per row, preferably sorted.
// If you don't load a dictionary, all words are misspelled and you won't get any suggestions // If you don't load a dictionary, all words are misspelled and you won't get any suggestions
S := ExtractFilePath(Application.ExeName) + 'english.dic'; S := ExtractFilePath(Application.ExeName) + '../../dict/english.dic';
if not FileExists(S) then if not FileExists(S) then
S := '..' + PathDelim + 'Dict' + PathDelim + 'english.dic'; S := '..' + PathDelim + 'Dict' + PathDelim + '../dict/english.dic';
if FileExists(S) then if FileExists(S) then
ASpellChecker.Dictionary := S ASpellChecker.Dictionary := S
else else

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="SimpleTLTest1"/> <Title Value="SimpleTLTest1"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -62,7 +64,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\SimpleTLTest1"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/SimpleTLTest1"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -53,7 +53,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvTabBarDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvTabBarDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -82,20 +82,20 @@ object Form1: TForm1
Font.Color = clWindowText Font.Color = clWindowText
DisabledFont.Color = clGrayText DisabledFont.Color = clGrayText
SelectedFont.Color = clWindowText SelectedFont.Color = clWindowText
left = 360 Left = 360
top = 192 Top = 192
end end
object JvTabBarXPPainter1: TJvTabBarXPPainter object JvTabBarXPPainter1: TJvTabBarXPPainter
Font.Color = clWindowText Font.Color = clWindowText
DisabledFont.Color = clGrayText DisabledFont.Color = clGrayText
SelectedFont.Color = clWindowText SelectedFont.Color = clWindowText
FixedTabSize = 0 FixedTabSize = 0
left = 360 Left = 360
top = 120 Top = 120
end end
object ImageList1: TImageList object ImageList1: TImageList
left = 208 Left = 208
top = 120 Top = 120
Bitmap = { Bitmap = {
4C69040000001000000010000000FFFFFF00FFFFFF00459AD3EF4498D2FF4197 4C69040000001000000010000000FFFFFF00FFFFFF00459AD3EF4498D2FF4197
D1FF3F95D1FF3D94D0FF3B93D0FF3B92CFFF3B92CFFF3B92CFFF3D94D0FF4398 D1FF3F95D1FF3D94D0FF3B93D0FF3B92CFFF3B92CFFF3B92CFFF3D94D0FF4398
@ -230,12 +230,12 @@ object Form1: TForm1
end end
object OpenDialog1: TOpenDialog object OpenDialog1: TOpenDialog
Options = [ofAllowMultiSelect, ofEnableSizing, ofViewDetail] Options = [ofAllowMultiSelect, ofEnableSizing, ofViewDetail]
left = 209 Left = 209
top = 191 Top = 191
end end
object PopupMenu1: TPopupMenu object PopupMenu1: TPopupMenu
left = 77 Left = 77
top = 109 Top = 109
object MenuItem1: TMenuItem object MenuItem1: TMenuItem
Action = AcModernPainter Action = AcModernPainter
AutoCheck = True AutoCheck = True
@ -249,8 +249,8 @@ object Form1: TForm1
end end
object ActionList1: TActionList object ActionList1: TActionList
Images = ImageList1 Images = ImageList1
left = 78 Left = 78
top = 184 Top = 184
object AcFileOpen: TAction object AcFileOpen: TAction
Category = 'File' Category = 'File'
Caption = 'Open...' Caption = 'Open...'
@ -278,8 +278,8 @@ object Form1: TForm1
end end
end end
object MainMenu1: TMainMenu object MainMenu1: TMainMenu
left = 77 Left = 77
top = 253 Top = 253
object MenuItem3: TMenuItem object MenuItem3: TMenuItem
Caption = 'File' Caption = 'File'
object MenuItem4: TMenuItem object MenuItem4: TMenuItem

View File

@ -96,7 +96,7 @@ end;
procedure TForm1.FormCreate(Sender: TObject); procedure TForm1.FormCreate(Sender: TObject);
begin begin
OpenDialog1.InitialDir := '..' + PathDelim + 'examples' + PathDelim + 'JvTabBar'; OpenDialog1.InitialDir := '../../examples/JvTabBar';
LoadFile(OpenDialog1.InitialDir + PathDelim + 'main.pas'); LoadFile(OpenDialog1.InitialDir + PathDelim + 'main.pas');
LoadFile(OpenDialog1.InitialDir + PathDelim + 'main.lfm'); LoadFile(OpenDialog1.InitialDir + PathDelim + 'main.lfm');
end; end;
@ -107,7 +107,7 @@ var
info: TTabInfo; info: TTabInfo;
begin begin
for i := JvTabBar1.Tabs.Count-1 downto 0 do begin for i := JvTabBar1.Tabs.Count-1 downto 0 do begin
info := TTabInfo((JvTabBar1.Tabs[i]).Tag); info := TTabInfo(JvTabBar1.Tabs[i].Tag);
FreeAndNil(info); FreeAndNil(info);
end; end;
end; end;

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="JvTabBarDemo_NotebookPages"/> <Title Value="JvTabBarDemo_NotebookPages"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@ -55,7 +57,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvTabBarDemo_NotebookPages"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvTabBarDemo_NotebookPages"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -7,7 +7,7 @@ object Form1: TForm1
ClientHeight = 438 ClientHeight = 438
ClientWidth = 669 ClientWidth = 669
OnCreate = FormCreate OnCreate = FormCreate
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
object JvTabBar1: TJvTabBar object JvTabBar1: TJvTabBar
Left = 0 Left = 0
Height = 30 Height = 30
@ -35,7 +35,7 @@ object Form1: TForm1
Height = 408 Height = 408
Top = 30 Top = 30
Width = 669 Width = 669
PageIndex = 1 PageIndex = 0
Align = alClient Align = alClient
TabOrder = 1 TabOrder = 1
object lprPage: TPage object lprPage: TPage
@ -1064,8 +1064,9 @@ object Form1: TForm1
DirectiveAttri.Style = [fsBold] DirectiveAttri.Style = [fsBold]
CompilerMode = pcmDelphi CompilerMode = pcmDelphi
NestedComments = False NestedComments = False
left = 157 TypeHelpers = True
top = 111 Left = 157
Top = 111
end end
object JvModernTabBarPainter1: TJvModernTabBarPainter object JvModernTabBarPainter1: TJvModernTabBarPainter
Color = clGradientInactiveCaption Color = clGradientInactiveCaption
@ -1076,22 +1077,22 @@ object Form1: TForm1
DisabledFont.Color = clGrayText DisabledFont.Color = clGrayText
SelectedFont.Color = clWindowText SelectedFont.Color = clWindowText
SelectedFont.Style = [fsBold] SelectedFont.Style = [fsBold]
left = 155 Left = 155
top = 209 Top = 209
end end
object JvTabBarXPPainter1: TJvTabBarXPPainter object JvTabBarXPPainter1: TJvTabBarXPPainter
Font.Color = clWindowText Font.Color = clWindowText
DisabledFont.Color = clGrayText DisabledFont.Color = clGrayText
SelectedFont.Color = clWindowText SelectedFont.Color = clWindowText
FixedTabSize = 0 FixedTabSize = 0
left = 312 Left = 312
top = 209 Top = 209
end end
object SynXMLSyn1: TSynXMLSyn object SynXMLSyn1: TSynXMLSyn
DefaultFilter = 'XML Document (*.xml,*.xsd,*.xsl,*.xslt,*.dtd)|*.xml;*.xsd;*.xsl;*.xslt;*.dtd' DefaultFilter = 'XML Document (*.xml,*.xsd,*.xsl,*.xslt,*.dtd)|*.xml;*.xsd;*.xsl;*.xslt;*.dtd'
Enabled = False Enabled = False
WantBracesParsed = False WantBracesParsed = False
left = 241 Left = 241
top = 111 Top = 111
end end
end end

View File

@ -50,7 +50,7 @@ procedure TForm1.FormCreate(Sender: TObject);
var var
dir: String; dir: String;
begin begin
dir := ExpandFileName(Application.Location + '../examples/JvTabBar_NotebookPages/'); dir := ExpandFileName(Application.Location + '../../examples/JvTabBar_NotebookPages/');
PasSynEdit.Lines.LoadfromFile(dir + 'main.pas'); PasSynEdit.Lines.LoadfromFile(dir + 'main.pas');
XMLSynEdit.Lines.LoadFromFile(dir + 'JvTabBarDemo_NotebookPages.lpi'); XMLSynEdit.Lines.LoadFromFile(dir + 'JvTabBarDemo_NotebookPages.lpi');
Image1.Picture.LoadFromFile(dir + 'JvTabBarDemo_NotebookPages.ico'); Image1.Picture.LoadFromFile(dir + 'JvTabBarDemo_NotebookPages.ico');

View File

@ -66,11 +66,11 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/JvThumbnailDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvThumbnailDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Linking> <Linking>
<Debugging> <Debugging>

View File

@ -13,7 +13,7 @@ object JvThumbnailMainForm: TJvThumbnailMainForm
Font.Color = clWindowText Font.Color = clWindowText
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
Scaled = False Scaled = False
object PageControl1: TPageControl object PageControl1: TPageControl
Left = 0 Left = 0
@ -879,13 +879,6 @@ object JvThumbnailMainForm: TJvThumbnailMainForm
ClientHeight = 24 ClientHeight = 24
ClientWidth = 931 ClientWidth = 931
TabOrder = 1 TabOrder = 1
object Bevel1: TBevel
Left = 3
Height = 18
Top = 3
Width = 291
Align = alLeft
end
object ProgressBar: TProgressBar object ProgressBar: TProgressBar
Left = 5 Left = 5
Height = 13 Height = 13

View File

@ -100,7 +100,6 @@ type
ThumbView: TJVThumbview; ThumbView: TJVThumbview;
Panel5: TPanel; Panel5: TPanel;
ProgressBar: TProgressBar; ProgressBar: TProgressBar;
Bevel1: TBevel;
procedure BtnEditSelThumbClick(Sender: TObject); procedure BtnEditSelThumbClick(Sender: TObject);
procedure BtnStopLoadingClick(Sender: TObject); procedure BtnStopLoadingClick(Sender: TObject);

View File

@ -53,7 +53,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="../../bin/JvFormatEditDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFormatEditDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -57,7 +57,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvValidatorsDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvValidatorsDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -55,7 +55,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\JvWizardDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvWizardDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -52,7 +52,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\XPBarDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/XPBarDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -54,7 +54,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\XPCtrls_SimpleDemo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/XPCtrls_SimpleDemo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -54,7 +54,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="..\..\bin\YearGrid_Demo"/> <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/YearGrid_Demo"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>

View File

@ -3,7 +3,6 @@
<Package Version="4"> <Package Version="4">
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Name Value="JvRuntimeDesignLazR"/> <Name Value="JvRuntimeDesignLazR"/>
<Type Value="RunAndDesignTime"/>
<CompilerOptions> <CompilerOptions>
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>

View File

@ -115,6 +115,7 @@ type
implementation implementation
uses uses
LCLVersion,
{$IFDEF LINUX} {$IFDEF LINUX}
baseunix, unix, linux, users, baseunix, unix, linux, users,
{$ELSE} {$ELSE}
@ -462,10 +463,12 @@ end;
procedure TProfReport.lvReportColumnClick(Sender: TObject; Column: TListColumn); procedure TProfReport.lvReportColumnClick(Sender: TObject; Column: TListColumn);
begin begin
{$IF LCL_FullVersion >= 2000000}
// lvReport.Items.BeginUpdate; // lvReport.Items.BeginUpdate;
lvReport.CustomSort(TLVCompare(@DefSort), Column.Index); lvReport.CustomSort(TLVCompare(@DefSort), Column.Index);
OddClick := not OddClick; OddClick := not OddClick;
// lvReport.Items.EndUpdate; // lvReport.Items.EndUpdate;
{$IFEND}
end; end;
procedure TProfReport.SaveBtnClick(Sender: TObject); procedure TProfReport.SaveBtnClick(Sender: TObject);

View File

@ -91,7 +91,7 @@ implementation
uses uses
StrUtils, StrUtils,
JvConsts, JvResources, JvTypes; JvConsts, JvResources, JvTypes, JvJCLUtils;
{$R *.lfm} {$R *.lfm}

View File

@ -1701,8 +1701,11 @@ begin
begin begin
Dest.Canvas.Brush.Color := clSilver; Dest.Canvas.Brush.Color := clSilver;
Dest.Canvas.FillRect(Bounds(0, 0, CellWidth, CellHeight)); Dest.Canvas.FillRect(Bounds(0, 0, CellWidth, CellHeight));
Dest.Canvas.Draw(-(Index mod Cols) * CellWidth, Dest.Canvas.Draw(
-(Index div Cols) * CellHeight, Source); -(Index mod Cols) * CellWidth,
-(Index div Cols) * CellHeight,
Source
);
end; end;
Dest.Transparent := Source.Transparent; Dest.Transparent := Source.Transparent;
end; end;

View File

@ -69,7 +69,7 @@ unit JvComboListBox;
interface interface
uses uses
LCLIntf, LCLType, LCLIntf, LCLType, LCLVersion,
Classes, Graphics, Controls, Forms, StdCtrls, Classes, Graphics, Controls, Forms, StdCtrls,
Menus; Menus;
@ -204,9 +204,11 @@ type
property OnMouseUp; property OnMouseUp;
property OnMouseWheel; property OnMouseWheel;
property OnMouseWheelDown; property OnMouseWheelDown;
{$IF LCL_FullVersion >= 2000000}
property OnMouseWheelHorz; property OnMouseWheelHorz;
property OnMouseWheelLeft; property OnMouseWheelLeft;
property OnMouseWheelRight; property OnMouseWheelRight;
{$IFEND}
property OnMouseWheelUp; property OnMouseWheelUp;
property OnResize; property OnResize;
property OnSelectionChange; property OnSelectionChange;
@ -464,7 +466,10 @@ begin
// draw the combo button // draw the combo button
GetCursorPos(Pt); GetCursorPos(Pt);
Pt := ScreenToClient(Pt); Pt := ScreenToClient(Pt);
I := ItemAtPos(Pt, True); if (Pt.X < 0) or (Pt.Y < 0) then
I := -1
else
I := ItemAtPos(Pt, True);
if (not HotTrackCombo and (State * [odSelected, odFocused] <> [])) or (HotTrackCombo and (I = Index)) then if (not HotTrackCombo and (State * [odSelected, odFocused] <> [])) or (HotTrackCombo and (I = Index)) then
begin begin
// draw frame // draw frame

View File

@ -75,9 +75,11 @@ type
property Styles[Index: Integer]: TFontStyles read GetStyles write SetStyles; property Styles[Index: Integer]: TFontStyles read GetStyles write SetStyles;
published published
property Align; property Align;
property Font; property BorderSpacing;
property Color default clBtnFace; property Color default clBtnFace;
property Constraints;
property DefaultImage: Integer read FDefaultImage write SetIndex default -1; property DefaultImage: Integer read FDefaultImage write SetIndex default -1;
property Font;
property Images: TCustomImageList read FImageList write SetImageList; property Images: TCustomImageList read FImageList write SetImageList;
property Lines: TStrings read GetLines write SetLines; property Lines: TStrings read GetLines write SetLines;
property LineSpacing: Integer read FLineSpacing write SetLineSpacing default 10; property LineSpacing: Integer read FLineSpacing write SetLineSpacing default 10;

View File

@ -41,7 +41,7 @@ unit JvRollOut;
interface interface
uses uses
LCLType, LCLIntf, LMessages, LCLType, LCLIntf, LMessages, LCLVersion,
SysUtils, Classes, Controls, Graphics, ImgList, ExtCtrls, ActnList, Forms, SysUtils, Classes, Controls, Graphics, ImgList, ExtCtrls, ActnList, Forms,
//JvExtComponent, //JvExtComponent,
JvThemes; JvThemes;
@ -258,7 +258,9 @@ type
property Font; property Font;
property GroupIndex; property GroupIndex;
property ImageOptions; property ImageOptions;
{$IF LCL_FullVersion >= 2000000}
property ParentBackground default True; property ParentBackground default True;
{$IFEND}
property ParentColor; property ParentColor;
property ParentFont; property ParentFont;
property ParentShowHint; property ParentShowHint;

View File

@ -41,7 +41,7 @@ unit JvDBControls;
interface interface
uses uses
JvBaseEdits, DB, DBCtrls, Classes, LMessages, GroupedEdit; JvBaseEdits, DB, DBCtrls, Classes, LMessages, LCLVersion, GroupedEdit;
type type
@ -129,8 +129,10 @@ type
property Enabled; property Enabled;
property Font; property Font;
property FormatOnEditing; property FormatOnEditing;
{$IF LCL_FullVersion >= 2000000}
property ImageIndex; property ImageIndex;
property Images; property Images;
{$IFEND}
property ButtonWidth; property ButtonWidth;
property HideSelection; property HideSelection;
property Anchors; property Anchors;

View File

@ -115,7 +115,7 @@ type
implementation implementation
uses uses
SysUtils; SysUtils, LCLVersion;
{$R ../../resource/jvled.res} {$R ../../resource/jvled.res}
@ -234,7 +234,11 @@ end;
procedure TJvCustomLED.DoBlink(Sender: TObject); procedure TJvCustomLED.DoBlink(Sender: TObject);
begin begin
{$IF LCL_FullVersion >= 2000000}
if not IsIconic(Application.Handle) then if not IsIconic(Application.Handle) then
{$ELSE}
if not IsIconic(Application.MainForm.Handle) then
{$IFEND}
Status := not Status; Status := not Status;
end; end;

View File

@ -1433,10 +1433,10 @@ end;
procedure TJvDEFColorSpace.AddCustomColor(AColor: TColor; procedure TJvDEFColorSpace.AddCustomColor(AColor: TColor;
AShortName, APrettyName: string); AShortName, APrettyName: string);
begin begin
if FDelphiColors.IndexOfObject(TObject(AColor)) = -1 then if FDelphiColors.IndexOfObject(TObject(PtrInt(AColor))) = -1 then
begin begin
FDelphiColors.Values[AShortName] := APrettyName; FDelphiColors.Values[AShortName] := APrettyName;
FDelphiColors.Objects[FDelphiColors.IndexOfName(AShortName)] := TObject(AColor); FDelphiColors.Objects[FDelphiColors.IndexOfName(AShortName)] := TObject(PtrInt(AColor));
end; end;
end; end;
@ -1447,7 +1447,7 @@ var
begin begin
NewColor := clNone; NewColor := clNone;
for I := 0 to FDelphiColors.Count - 1 do for I := 0 to FDelphiColors.Count - 1 do
if AColor = TColor(FDelphiColors.Objects[I]) then if AColor = PtrInt(FDelphiColors.Objects[I]) then
begin begin
NewColor := AColor; NewColor := AColor;
Break; Break;
@ -1512,7 +1512,7 @@ end;
function TJvDEFColorSpace.GetColorValue(Index: Integer): TColor; function TJvDEFColorSpace.GetColorValue(Index: Integer): TColor;
begin begin
if (Index >= 0) and (Index < FDelphiColors.Count) then if (Index >= 0) and (Index < FDelphiColors.Count) then
Result := TColor(FDelphiColors.Objects[Index]) Result := PtrInt(FDelphiColors.Objects[Index])
else else
Result := clNone; Result := clNone;
end; end;

View File

@ -3854,7 +3854,7 @@ begin
if hfUnsynchronisation in Header.Flags then if hfUnsynchronisation in Header.Flags then
ApplyUnsynchronisationSchemeOnCurrentStream; ApplyUnsynchronisationSchemeOnCurrentStream;
FileStream := TFileStream.Create(FFileName, fmOpenReadWrite or fmShareExclusive); FileStream := TFileStream.Create(AFileName, fmOpenReadWrite or fmShareExclusive);
try try
OldTagSizeInclHeader := GetTagSizeInclHeader(FileStream); OldTagSizeInclHeader := GetTagSizeInclHeader(FileStream);
@ -5151,7 +5151,7 @@ end;
procedure TJvID3Frame.DataChanged; procedure TJvID3Frame.DataChanged;
begin begin
if Assigned(FController) then if Assigned(FController) then
FController.ID3Event(ideFrameChange, Longint(Self)); FController.ID3Event(ideFrameChange, PtrInt(Self));
end; end;
procedure TJvID3Frame.Error(const Msg: string); procedure TJvID3Frame.Error(const Msg: string);

View File

@ -1325,7 +1325,7 @@ end;
procedure TJvID3TermFinder.BuildList_ID3Genres; procedure TJvID3TermFinder.BuildList_ID3Genres;
var var
I: Integer; I: PtrInt;
begin begin
if Assigned(FLists[ltID3Genres]) then if Assigned(FLists[ltID3Genres]) then
Exit; Exit;
@ -1358,7 +1358,7 @@ begin
for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do
with CID3FrameDefs[FrameID] do with CID3FrameDefs[FrameID] do
if LongTextID[0] <> #0 then if LongTextID[0] <> #0 then
AddObject(string(LongTextID), TObject(FrameID)); AddObject(string(LongTextID), TObject(PtrInt(FrameID)));
end; end;
end; end;
@ -1378,13 +1378,13 @@ begin
for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do
with CID3FrameDefs[FrameID] do with CID3FrameDefs[FrameID] do
if ShortTextID[0] <> #0 then if ShortTextID[0] <> #0 then
AddObject(string(ShortTextID), TObject(FrameID)); AddObject(string(ShortTextID), TObject(PtrInt(FrameID)));
end; end;
end; end;
procedure TJvID3TermFinder.BuildList_ISO_639_2Code; procedure TJvID3TermFinder.BuildList_ISO_639_2Code;
var var
I: Integer; I: PtrInt;
begin begin
if Assigned(FLists[ltISO_639_2Code]) then if Assigned(FLists[ltISO_639_2Code]) then
Exit; Exit;
@ -1403,7 +1403,7 @@ end;
procedure TJvID3TermFinder.BuildList_ISO_639_2Name; procedure TJvID3TermFinder.BuildList_ISO_639_2Name;
var var
I: Integer; I: PtrInt;
begin begin
if Assigned(FLists[ltISO_639_2Name]) then if Assigned(FLists[ltISO_639_2Name]) then
Exit; Exit;
@ -1436,7 +1436,7 @@ begin
AStrings.AddObject('', TObject(255)); AStrings.AddObject('', TObject(255));
for I := 0 to FLists[ltID3Genres].Count - 1 do for I := 0 to FLists[ltID3Genres].Count - 1 do
if InclWinampGenres or (Integer(FLists[ltID3Genres].Objects[I]) <= CGenre_HighV1) then if InclWinampGenres or (PtrInt(FLists[ltID3Genres].Objects[I]) <= CGenre_HighV1) then
AStrings.AddObject(FLists[ltID3Genres][I], FLists[ltID3Genres].Objects[I]); AStrings.AddObject(FLists[ltID3Genres][I], FLists[ltID3Genres].Objects[I]);
finally finally
AStrings.EndUpdate; AStrings.EndUpdate;
@ -1464,7 +1464,7 @@ begin
Result := -1; Result := -1;
if Result >= 0 then if Result >= 0 then
Result := Integer(FLists[ltID3Genres].Objects[Result]) Result := PtrInt(FLists[ltID3Genres].Objects[Result])
else else
Result := cDefaultGenre[InclWinampGenres]; Result := cDefaultGenre[InclWinampGenres];
end; end;
@ -1494,7 +1494,7 @@ begin
Result := -1; Result := -1;
if Result >= 0 then if Result >= 0 then
Result := Integer(FLists[ltID3Genres].Objects[Result]) Result := PtrInt(FLists[ltID3Genres].Objects[Result])
else else
Result := CDefaultGenre[InclWinampGenres]; Result := CDefaultGenre[InclWinampGenres];
end; end;
@ -1516,7 +1516,7 @@ begin
if I < 0 then if I < 0 then
Result := fiUnknownFrame Result := fiUnknownFrame
else else
Result := TJvID3FrameID(FLists[ltID3LongText].Objects[I]); Result := TJvID3FrameID(PtrInt(FLists[ltID3LongText].Objects[I]));
end; end;
function TJvID3TermFinder.ID3ShortTextToFrameID( function TJvID3TermFinder.ID3ShortTextToFrameID(
@ -1536,7 +1536,7 @@ begin
if I < 0 then if I < 0 then
Result := fiUnknownFrame Result := fiUnknownFrame
else else
Result := TJvID3FrameID(FLists[ltID3ShortText].Objects[I]); Result := TJvID3FrameID(PtrInt(FLists[ltID3ShortText].Objects[I]));
end; end;
function TJvID3TermFinder.IsFrameOk(const S: AnsiString): Boolean; function TJvID3TermFinder.IsFrameOk(const S: AnsiString): Boolean;
@ -1560,7 +1560,7 @@ begin
Result := FLists[ltISO_639_2Code].IndexOf(string(AnsiLowerCase(ACode))); Result := FLists[ltISO_639_2Code].IndexOf(string(AnsiLowerCase(ACode)));
if Result >= 0 then if Result >= 0 then
Result := Integer(FLists[ltISO_639_2Code].Objects[Result]); Result := Integer(PtrInt(FLists[ltISO_639_2Code].Objects[Result]));
end; end;
procedure TJvID3TermFinder.ISO_639_2Names(AStrings: TStrings); procedure TJvID3TermFinder.ISO_639_2Names(AStrings: TStrings);
@ -1577,7 +1577,7 @@ begin
Result := FLists[ltISO_639_2Name].IndexOf(AName); Result := FLists[ltISO_639_2Name].IndexOf(AName);
if Result >= 0 then if Result >= 0 then
Result := Integer(FLists[ltISO_639_2Name].Objects[Result]); Result := PtrInt(FLists[ltISO_639_2Name].Objects[Result]);
end; end;
initialization initialization

View File

@ -32,7 +32,6 @@ interface
uses uses
SysUtils, Classes; SysUtils, Classes;
// JvComponentBase;
type type
TJvStrToHtml = class(TComponent) // TJvComponent) TJvStrToHtml = class(TComponent) // TJvComponent)
@ -58,7 +57,7 @@ function HtmlToString(const Value: string): string;
implementation implementation
uses uses
LazUtf8; LCLVersion, LazUtf8;
type type
TJvHtmlCodeRec = record TJvHtmlCodeRec = record
@ -408,7 +407,11 @@ begin
if P^ in ['a'..'z', 'A'..'Z', '0'..'9', '_', ' '] then if P^ in ['a'..'z', 'A'..'Z', '0'..'9', '_', ' '] then
Append(P^) Append(P^)
else begin else begin
{$IF LCL_FullVersion >= 2000000}
ch := UTF8CodePointToUniCode(P, n); ch := UTF8CodePointToUniCode(P, n);
{$ELSE}
ch := UTF8CharacterToUniCode(P, n);
{$IFEND}
found := false; found := false;
for J := Low(Conversions) to High(Conversions) do for J := Low(Conversions) to High(Conversions) do
if ch = Conversions[J].Ch then begin if ch = Conversions[J].Ch then begin

View File

@ -2260,7 +2260,7 @@ end;
procedure TJvNavIconButton.ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange); procedure TJvNavIconButton.ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange);
begin begin
if (Msg.Sender <> Self) and ParentStyleManager then if (Msg.Sender <> Self) and ParentStyleManager and not (csDestroying in ComponentState) then
begin begin
StyleManager := Msg.StyleManager; StyleManager := Msg.StyleManager;
ParentStyleManager := True; ParentStyleManager := True;

View File

@ -67,7 +67,7 @@ type
FImageIndex: TImageIndex; FImageIndex: TImageIndex;
FEnabled: Boolean; FEnabled: Boolean;
FVisible: Boolean; FVisible: Boolean;
FTag: Integer; FTag: PtrInt;
FData: TObject; FData: TObject;
FHint: TCaption; FHint: TCaption;
FName: string; FName: string;
@ -121,7 +121,7 @@ type
property Modified: Boolean read GetModified write SetModified default False; property Modified: Boolean read GetModified write SetModified default False;
property Hint: TCaption read FHint write FHint; property Hint: TCaption read FHint write FHint;
property ImageIndex: TImageIndex read FImageIndex write SetImageIndex default -1; property ImageIndex: TImageIndex read FImageIndex write SetImageIndex default -1;
property Tag: Integer read FTag write FTag default 0; property Tag: PtrInt read FTag write FTag default 0;
property Visible: Boolean read FVisible write SetVisible default True; property Visible: Boolean read FVisible write SetVisible default True;
property PopupMenu: TPopupMenu read FPopupMenu write SetPopupMenu; property PopupMenu: TPopupMenu read FPopupMenu write SetPopupMenu;
property ShowHint: Boolean read FShowHint write FShowHint default True; property ShowHint: Boolean read FShowHint write FShowHint default True;

View File

@ -37,7 +37,8 @@ unit JvBaseEdits;
interface interface
uses uses
Classes, SysUtils, EditBtn, LMessages, CalcForm, Forms, GroupedEdit; Classes, SysUtils, EditBtn, LMessages, LCLVersion, Forms,
CalcForm, GroupedEdit;
type type
@ -173,9 +174,11 @@ type
property ButtonWidth; property ButtonWidth;
property Glyph; property Glyph;
property NumGlyphs; property NumGlyphs;
{$IF LCL_FullVersion >= 2000000}
property Images; property Images;
property ImageIndex; property ImageIndex;
property ImageWidth; property ImageWidth;
{$IFEND}
property Action; property Action;
property DirectInput; property DirectInput;
property FocusOnButtonClick; property FocusOnButtonClick;
@ -254,9 +257,11 @@ type
property DragKind; property DragKind;
property Glyph; property Glyph;
property NumGlyphs; property NumGlyphs;
{$IF LCL_FullVersion >= 2000000}
property Images; property Images;
property ImageIndex; property ImageIndex;
property ImageWidth; property ImageWidth;
{$IFEND}
property Flat; property Flat;
property ParentBiDiMode; property ParentBiDiMode;
property OnEndDock; property OnEndDock;

View File

@ -337,7 +337,8 @@ interface
uses uses
SysUtils, Classes, SysUtils, Classes,
Controls, Forms, Graphics, Buttons, ImgList, Types, LMessages, LCLType, LCLIntf, Controls, Forms, Graphics, Buttons, ImgList, Types,
LMessages, LCLType, LCLIntf, LCLVersion,
JvWizardCommon, JvComponent; JvWizardCommon, JvComponent;
type type
@ -795,7 +796,9 @@ type
procedure RepositionButtons; procedure RepositionButtons;
procedure UpdateButtonsStatus; procedure UpdateButtonsStatus;
procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND; procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND;
{$IF LCL_FullVersion >= 2000000}
procedure WMGetDlgCode(var Msg: TLMGetDlgCode); message LM_GETDLGCODE; procedure WMGetDlgCode(var Msg: TLMGetDlgCode); message LM_GETDLGCODE;
{$IFEND}
procedure CMDesignHitTest(var Msg: TCMDesignHitTest); message CM_DESIGNHITTEST; procedure CMDesignHitTest(var Msg: TCMDesignHitTest); message CM_DESIGNHITTEST;
function FindNextEnabledPage(PageIndex: Integer; const Step: Integer = 1; function FindNextEnabledPage(PageIndex: Integer; const Step: Integer = 1;
CheckDisable: Boolean = True): TJvWizardCustomPage; CheckDisable: Boolean = True): TJvWizardCustomPage;
@ -2959,10 +2962,12 @@ begin
Rect.Bottom := Rect.Bottom - FButtonBarHeight; Rect.Bottom := Rect.Bottom - FButtonBarHeight;
end; end;
{$IF LCL_FullVersion >= 2000000}
procedure TJvWizard.WMGetDlgCode(var Msg: TLMGetDlgCode); procedure TJvWizard.WMGetDlgCode(var Msg: TLMGetDlgCode);
begin begin
Msg.Result := DLGC_WANTALLKEYS or DLGC_WANTARROWS; Msg.Result := DLGC_WANTALLKEYS or DLGC_WANTARROWS;
end; end;
{$IFEND}
procedure TJvWizard.UpdateButtonsStatus; procedure TJvWizard.UpdateButtonsStatus;
var var