From a67a3f9d553481dc884f8ea2efa01794285575a1 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 29 May 2019 23:35:34 +0000 Subject: [PATCH] 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 --- .../jvcllaz/design/JvMM/jvid3v2defineform.pas | 4 +- .../examples/JVTimeLine/TimeLineDemo.lpi | 2 +- .../examples/JvBmpAnimator/BmpAnimDemo.lpi | 10 +- .../examples/JvBmpAnimator/BmpAnimDemo.lpr | 1 + .../examples/JvCheckBox/JvCheckBoxDemo.lpi | 9 +- .../JvComboListBox/JvComboListBoxDemo.lpi | 16 +- .../examples/JvDBLookup/JvDBLookupDemo.lpi | 2 +- .../JvDBLookupTreeViewDemo.lpi | 2 +- .../JvDBSearchEdit/JvSearchEditDemo.lpi | 8 +- .../JvDBTreeView/JVDBTreeViewDemo.lpi | 9 +- .../JvDBTreeView/JVDBTreeViewDemo.lpr | 1 + .../examples/JvDesigner/jvDesignerDemo.lpi | 10 +- .../JvDialButton/JvDialButtonDemo.lpi | 2 +- .../JvFormAnimations_Demo.lpi | 2 +- .../JvFormWallper/JvFormWallpaper_Demo.lpi | 2 +- .../JvFullColorCircleDialogMainForm.lfm | 4 +- .../JvFullColorCircleDialogMainForm.pas | 2 +- .../JvFullColorCircleDialogPrj.lpi | 5 +- .../JvFullColorDialogMainForm.lfm | 2 +- .../JvFullColorDialogMainForm.pas | 2 +- .../JvFullColorDialogPrj.lpi | 2 +- .../examples/JvHTControls/JvHTCtrlsDemo.lpi | 2 +- .../jvcllaz/examples/JvHTML/JvHTMLTest.lpi | 2 +- .../jvcllaz/examples/JvHTML/htmltestform.lfm | 4 +- .../JvHTMLParser/JvHtmlParserProj.lpi | 8 +- .../jvcllaz/examples/JvID3v1/JvID3v1Demo.lpi | 2 +- .../examples/JvID3v1/JvID3v1MainFormU.lfm | 2 +- .../examples/JvID3v1/JvID3v1MainFormU.pas | 2 +- .../jvcllaz/examples/JvID3v2/JvId3v2Demo.lpi | 2 +- .../examples/JvID3v2/JvId3v2EditFormU.lfm | 2 +- .../examples/JvID3v2/JvId3v2EditFormU.pas | 8 +- .../JvInstallLabel/Install2LabelDemo.lpi | 2 +- .../JvInstallLabel/InstallLabelMainFormU.lfm | 111 +++++++------ .../JvInstallLabel/InstallLabelMainFormU.pas | 6 +- .../JvItemViewer/JvItemViewerDemo.lpi | 10 +- .../jvcllaz/examples/JvLED/JvLEDDemo.lpi | 2 +- .../JvLookupAutoCompleteDemo.lpi | 2 +- .../jvcllaz/examples/JvMarkup/MarkupDemo.lpi | 2 +- .../JvNavigationPane/JvNavPaneDemo.lpi | 147 ++++++++++-------- .../JvNavPaneDemoMainForm.lfm | 2 +- .../JvNavPaneDemoMainForm.pas | 3 - .../examples/JvOutlookBar/OLBarDemo.lpi | 2 +- .../JvOutlookBarCustomDrawDemo.lpi | 2 +- .../examples/JvPicClip/JvPicClipDemo.lpi | 16 +- .../jvcllaz/examples/JvPicClip/main.lfm | 4 +- .../jvcllaz/examples/JvPicClip/main.pas | 68 ++++---- .../examples/JvProfiler32/ProfilerDemo.lpi | 2 +- .../examples/JvRollOut/JvRollOutDemo.lpi | 11 +- .../jvcllaz/examples/JvRollOut/MainFrm.lfm | 2 +- .../jvcllaz/examples/JvRollOut/MainFrm.pas | 4 +- .../examples/JvSimScope/JvSimScopeDemo.lpi | 9 +- .../specialprogress_demo.lpi | 2 +- .../JvSpellChecker/JvSpellCheckerDemo.lpi | 12 +- .../JvSpellChecker/JvSpellCheckerDemo.lpr | 1 + .../JvSpellChecker/jvspellcheckerform.lfm | 6 +- .../JvSpellChecker/jvspellcheckerform.pas | 7 +- .../examples/JvTMTimeLine/SimpleTLTest1.lpi | 8 +- .../examples/JvTabBar/JvTabBarDemo.lpi | 2 +- components/jvcllaz/examples/JvTabBar/main.lfm | 28 ++-- components/jvcllaz/examples/JvTabBar/main.pas | 4 +- .../JvTabBarDemo_NotebookPages.lpi | 8 +- .../examples/JvTabBar_NotebookPages/main.lfm | 21 +-- .../examples/JvTabBar_NotebookPages/main.pas | 2 +- .../examples/JvThumbnail/JvThumbnailDemo.lpi | 4 +- .../JvThumbnail/JvThumbnailMainFormU.lfm | 9 +- .../JvThumbnail/JvThumbnailMainFormU.pas | 1 - .../JvValidateEdit/JvFormatEditDemo.lpi | 2 +- .../JvValidators/JvValidatorsDemo.lpi | 2 +- .../examples/JvWizard/JvWizardDemo.lpi | 2 +- .../jvcllaz/examples/JvXPBar/XPBarDemo.lpi | 2 +- .../jvcllaz/examples/JvXPCtrls/SimpleDemo.lpi | 2 +- .../examples/JvYearGrid/YearGrid_Demo.lpi | 2 +- .../jvcllaz/packages/jvruntimedesignlazr.lpk | 1 - .../jvcllaz/run/JvCmp/jvprofilerform.pas | 3 + .../jvcllaz/run/JvCmp/jvspellerform.pas | 2 +- components/jvcllaz/run/JvCore/jvjvclutils.pas | 7 +- .../jvcllaz/run/JvCtrls/jvcombolistbox.pas | 9 +- .../jvcllaz/run/JvCtrls/jvinstalllabel.pas | 4 +- components/jvcllaz/run/JvCtrls/jvrollout.pas | 4 +- components/jvcllaz/run/JvDB/jvdbcontrols.pas | 4 +- components/jvcllaz/run/JvHMI/jvled.pas | 6 +- .../jvcllaz/run/JvMM/jvfullcolorspaces.pas | 8 +- components/jvcllaz/run/JvMM/jvid3v2base.pas | 4 +- components/jvcllaz/run/JvMM/jvid3v2types.pas | 24 +-- components/jvcllaz/run/JvNet/jvstrtohtml.pas | 7 +- .../run/JvPageComps/jvnavigationpane.pas | 2 +- .../jvcllaz/run/JvPageComps/jvtabbar.pas | 4 +- .../jvcllaz/run/JvStdCtrls/jvbaseedits.pas | 7 +- components/jvcllaz/run/JvWizard/jvwizard.pas | 7 +- 89 files changed, 441 insertions(+), 327 deletions(-) diff --git a/components/jvcllaz/design/JvMM/jvid3v2defineform.pas b/components/jvcllaz/design/JvMM/jvid3v2defineform.pas index d5fed9610..051b01ccc 100644 --- a/components/jvcllaz/design/JvMM/jvid3v2defineform.pas +++ b/components/jvcllaz/design/JvMM/jvid3v2defineform.pas @@ -102,7 +102,7 @@ begin Strings.AddObject( Format('%s - %s', [ID3_FrameIDToString(lFrameID), TFSDesigner(FSDesigner).FrameDescription[lFrameID]]), - TObject(lFrameID)); + TObject(PtrInt(lFrameID))); finally Strings.EndUpdate; end; @@ -128,7 +128,7 @@ function TJvID3DefineDlg.GetFrameID: TJvID3FrameID; begin with cmbFrames do if ItemIndex >= 0 then - Result := TJvID3FrameID(Items.Objects[ItemIndex]) + Result := TJvID3FrameID(PtrInt(Items.Objects[ItemIndex])) else Result := fiUnknownFrame; end; diff --git a/components/jvcllaz/examples/JVTimeLine/TimeLineDemo.lpi b/components/jvcllaz/examples/JVTimeLine/TimeLineDemo.lpi index b336831d8..8842c6ebc 100644 --- a/components/jvcllaz/examples/JVTimeLine/TimeLineDemo.lpi +++ b/components/jvcllaz/examples/JVTimeLine/TimeLineDemo.lpi @@ -62,7 +62,7 @@ - + diff --git a/components/jvcllaz/examples/JvBmpAnimator/BmpAnimDemo.lpi b/components/jvcllaz/examples/JvBmpAnimator/BmpAnimDemo.lpi index 4b492f18f..2d7c7e766 100644 --- a/components/jvcllaz/examples/JvBmpAnimator/BmpAnimDemo.lpi +++ b/components/jvcllaz/examples/JvBmpAnimator/BmpAnimDemo.lpi @@ -1,14 +1,13 @@ - + - + - <Scaled Value="True"/> <ResourceType Value="res"/> @@ -45,7 +44,9 @@ <Unit1> <Filename Value="BmpAnimMainFormU.pas"/> <IsPartOfProject Value="True"/> + <ComponentName Value="BmpAnimMainForm"/> <HasResources Value="True"/> + <ResourceBaseClass Value="Form"/> </Unit1> </Units> </ProjectOptions> @@ -53,9 +54,10 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="BmpAnimDemo"/> + <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\BmpAnimDemo"/> </Target> <SearchPaths> + <IncludeFiles Value="$(ProjOutDir)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Linking> diff --git a/components/jvcllaz/examples/JvBmpAnimator/BmpAnimDemo.lpr b/components/jvcllaz/examples/JvBmpAnimator/BmpAnimDemo.lpr index 1b94f3cf4..943e8e3d7 100644 --- a/components/jvcllaz/examples/JvBmpAnimator/BmpAnimDemo.lpr +++ b/components/jvcllaz/examples/JvBmpAnimator/BmpAnimDemo.lpr @@ -8,6 +8,7 @@ uses {$R *.res} begin + Application.Scaled:=True; Application.Initialize; Application.CreateForm(TBmpAnimMainForm, BmpAnimMainForm); Application.Run; diff --git a/components/jvcllaz/examples/JvCheckBox/JvCheckBoxDemo.lpi b/components/jvcllaz/examples/JvCheckBox/JvCheckBoxDemo.lpi index a3fc3a971..16696f363 100644 --- a/components/jvcllaz/examples/JvCheckBox/JvCheckBoxDemo.lpi +++ b/components/jvcllaz/examples/JvCheckBox/JvCheckBoxDemo.lpi @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> + <Flags> + <CompatibilityMode Value="True"/> + </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="JvCheckBoxDemo"/> <Scaled Value="True"/> <ResourceType Value="res"/> @@ -43,6 +45,7 @@ <Filename Value="jvcheckboxdemounit.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="Form1"/> + <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> <UnitName Value="JvCheckBoxDemoUnit"/> </Unit1> @@ -52,7 +55,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvCheckBoxDemo"/> + <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvCheckBoxDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvComboListBox/JvComboListBoxDemo.lpi b/components/jvcllaz/examples/JvComboListBox/JvComboListBoxDemo.lpi index 9a1b20583..b51a69143 100644 --- a/components/jvcllaz/examples/JvComboListBox/JvComboListBoxDemo.lpi +++ b/components/jvcllaz/examples/JvComboListBox/JvComboListBoxDemo.lpi @@ -63,12 +63,26 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvComboListBoxDemo"/> + <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvComboListBoxDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </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> <Options> <Win32> diff --git a/components/jvcllaz/examples/JvDBLookup/JvDBLookupDemo.lpi b/components/jvcllaz/examples/JvDBLookup/JvDBLookupDemo.lpi index 4897edaaf..1a7bff103 100644 --- a/components/jvcllaz/examples/JvDBLookup/JvDBLookupDemo.lpi +++ b/components/jvcllaz/examples/JvDBLookup/JvDBLookupDemo.lpi @@ -56,7 +56,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvDBLookupDemo"/> + <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDBLookupDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvDBLookupTreeView/JvDBLookupTreeViewDemo.lpi b/components/jvcllaz/examples/JvDBLookupTreeView/JvDBLookupTreeViewDemo.lpi index 450aaaec9..9a8b1cc5a 100644 --- a/components/jvcllaz/examples/JvDBLookupTreeView/JvDBLookupTreeViewDemo.lpi +++ b/components/jvcllaz/examples/JvDBLookupTreeView/JvDBLookupTreeViewDemo.lpi @@ -56,7 +56,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvDBLookupTreeViewDemo"/> + <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDBLookupTreeViewDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvDBSearchEdit/JvSearchEditDemo.lpi b/components/jvcllaz/examples/JvDBSearchEdit/JvSearchEditDemo.lpi index 4288de503..c4ddff873 100644 --- a/components/jvcllaz/examples/JvDBSearchEdit/JvSearchEditDemo.lpi +++ b/components/jvcllaz/examples/JvDBSearchEdit/JvSearchEditDemo.lpi @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> + <Flags> + <CompatibilityMode Value="True"/> + </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="JvSearchEditDemo"/> <ResourceType Value="res"/> <UseXPManifest Value="True"/> @@ -52,7 +54,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvSearchEditDemo"/> + <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvSearchEditDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvDBTreeView/JVDBTreeViewDemo.lpi b/components/jvcllaz/examples/JvDBTreeView/JVDBTreeViewDemo.lpi index cc48c9590..afb72b725 100644 --- a/components/jvcllaz/examples/JvDBTreeView/JVDBTreeViewDemo.lpi +++ b/components/jvcllaz/examples/JvDBTreeView/JVDBTreeViewDemo.lpi @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> + <Flags> + <CompatibilityMode Value="True"/> + </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="JVDBTreeViewDemo"/> <Scaled Value="True"/> <ResourceType Value="res"/> @@ -13,7 +15,6 @@ <XPManifest> <DpiAware Value="True"/> </XPManifest> - <Icon Value="0"/> </General> <BuildModes Count="1"> <Item1 Name="Default" Default="True"/> @@ -58,7 +59,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvDBTreeViewDemo"/> + <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDBTreeViewDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvDBTreeView/JVDBTreeViewDemo.lpr b/components/jvcllaz/examples/JvDBTreeView/JVDBTreeViewDemo.lpr index a560d1714..d85cf3b2c 100644 --- a/components/jvcllaz/examples/JvDBTreeView/JVDBTreeViewDemo.lpr +++ b/components/jvcllaz/examples/JvDBTreeView/JVDBTreeViewDemo.lpr @@ -17,6 +17,7 @@ begin {$IFDEF LCLVersion >= 1080000} Application.Scaled := True; {$ENDIF} + Application.Scaled:=True; Application.Initialize; Application.CreateForm(TForm1, Form1); Application.Run; diff --git a/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi b/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi index d870e0890..43ed60ab0 100644 --- a/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi +++ b/components/jvcllaz/examples/JvDesigner/jvDesignerDemo.lpi @@ -231,7 +231,7 @@ <Loaded Value="True"/> </Unit25> <Unit26> - <Filename Value="C:\lazarus-trunk_fpc304\lcl\forms.pp"/> + <Filename Value="c:\lazarus-trunk_fpc304\lcl\forms.pp"/> <UnitName Value="Forms"/> <EditorIndex Value="8"/> <TopLine Value="1737"/> @@ -247,7 +247,7 @@ <UsageCount Value="12"/> </Unit27> <Unit28> - <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\control.inc"/> + <Filename Value="c:\lazarus-trunk_fpc304\lcl\include\control.inc"/> <EditorIndex Value="3"/> <TopLine Value="3305"/> <CursorPos Y="3324"/> @@ -255,7 +255,7 @@ <Loaded Value="True"/> </Unit28> <Unit29> - <Filename Value="C:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/> + <Filename Value="c:\lazarus-trunk_fpc304\lcl\include\wincontrol.inc"/> <EditorIndex Value="4"/> <TopLine Value="8121"/> <CursorPos Y="8145"/> @@ -263,7 +263,7 @@ <Loaded Value="True"/> </Unit29> <Unit30> - <Filename Value="C:\lazarus-trunk_fpc304\lcl\lclmessageglue.pas"/> + <Filename Value="c:\lazarus-trunk_fpc304\lcl\lclmessageglue.pas"/> <UnitName Value="LCLMessageGlue"/> <EditorIndex Value="2"/> <TopLine Value="102"/> @@ -399,7 +399,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\jvDesignerDemo"/> + <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDesignerDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvDialButton/JvDialButtonDemo.lpi b/components/jvcllaz/examples/JvDialButton/JvDialButtonDemo.lpi index 475ef0283..473d38f4c 100644 --- a/components/jvcllaz/examples/JvDialButton/JvDialButtonDemo.lpi +++ b/components/jvcllaz/examples/JvDialButton/JvDialButtonDemo.lpi @@ -55,7 +55,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvDialButtonDemo"/> + <Filename Value="..\..\bin\$(TargetCPU)-$(TargetOS)\JvDialButtonDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvFormAnimations/JvFormAnimations_Demo.lpi b/components/jvcllaz/examples/JvFormAnimations/JvFormAnimations_Demo.lpi index dab433c88..97acd104c 100644 --- a/components/jvcllaz/examples/JvFormAnimations/JvFormAnimations_Demo.lpi +++ b/components/jvcllaz/examples/JvFormAnimations/JvFormAnimations_Demo.lpi @@ -53,7 +53,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/JvFormAnimations_Demo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFormAnimations_Demo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvFormWallper/JvFormWallpaper_Demo.lpi b/components/jvcllaz/examples/JvFormWallper/JvFormWallpaper_Demo.lpi index 184b973f1..548c75ac2 100644 --- a/components/jvcllaz/examples/JvFormWallper/JvFormWallpaper_Demo.lpi +++ b/components/jvcllaz/examples/JvFormWallper/JvFormWallpaper_Demo.lpi @@ -54,7 +54,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/JvFormWallpaper_Demo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFormWallpaper_Demo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.lfm b/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.lfm index a43a5c2ae..d30ca9a26 100644 --- a/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.lfm +++ b/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.lfm @@ -101,7 +101,7 @@ object JvFullColorCircleDlgMainFrm: TJvFullColorCircleDlgMainFrm object JvFullColorCircleDialog: TJvFullColorCircleDialog HelpContext = 0 OnApply = JvFullColorCircleDialogApply - left = 184 - top = 80 + Left = 184 + Top = 80 end end diff --git a/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.pas b/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.pas index da997bcd8..1b6ccf757 100644 --- a/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.pas +++ b/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogMainForm.pas @@ -92,7 +92,7 @@ procedure TJvFullColorCircleDlgMainFrm.FormCreate(Sender: TObject); var LSearchRec: TSearchRec; begin - ImgDir := IncludeTrailingPathDelimiter(GetCurrentDir) + '../design/JvCtrls/images/'; + ImgDir := IncludeTrailingPathDelimiter(GetCurrentDir) + '../../design/JvCtrls/images/'; if FindFirst(ImgDir + '*.png', faAnyFile, LSearchRec) = 0 then repeat ComboBoxFileName.Items.Add(LSearchRec.Name); diff --git a/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogPrj.lpi b/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogPrj.lpi index cd66ee359..0ced3deed 100644 --- a/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogPrj.lpi +++ b/components/jvcllaz/examples/JvFullColorCircleDialog/JvFullColorCircleDialogPrj.lpi @@ -54,13 +54,16 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/JvFullColorCircleDialogPrj"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFullColorCircleDialogPrj"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Linking> + <Debugging> + <UseExternalDbgSyms Value="True"/> + </Debugging> <Options> <Win32> <GraphicApplication Value="True"/> diff --git a/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogMainForm.lfm b/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogMainForm.lfm index c345850c8..e1edbbf88 100644 --- a/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogMainForm.lfm +++ b/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogMainForm.lfm @@ -11,7 +11,7 @@ object JvFullColorDialogMainFrm: TJvFullColorDialogMainFrm OnCreate = FormCreate OnShow = FormShow Position = poScreenCenter - LCLVersion = '2.1.0.0' + LCLVersion = '2.0.2.0' Visible = True object JvFullColorLabel: TJvFullColorLabel Left = 16 diff --git a/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogMainForm.pas b/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogMainForm.pas index 941c1a7dc..c7e518258 100644 --- a/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogMainForm.pas +++ b/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogMainForm.pas @@ -165,7 +165,7 @@ begin with TJvFullColorLabel(Sender) do begin JvFullColorDialog.FullColor := LabelColor; - JvFullColorDialog.Tag := Integer(Sender); + JvFullColorDialog.Tag := PtrInt(Sender); if JvFullColorDialog.Execute then begin LabelColor := JvFullColorDialog.FullColor; diff --git a/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogPrj.lpi b/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogPrj.lpi index 29203bf75..a950f921b 100644 --- a/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogPrj.lpi +++ b/components/jvcllaz/examples/JvFullColorDialog/JvFullColorDialogPrj.lpi @@ -53,7 +53,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/JvFullColorDialogPrj"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFullColorDialogPrj"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvHTControls/JvHTCtrlsDemo.lpi b/components/jvcllaz/examples/JvHTControls/JvHTCtrlsDemo.lpi index a5bd119b7..9184b5230 100644 --- a/components/jvcllaz/examples/JvHTControls/JvHTCtrlsDemo.lpi +++ b/components/jvcllaz/examples/JvHTControls/JvHTCtrlsDemo.lpi @@ -60,7 +60,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvHTCtrlsDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvHTCtrlsDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvHTML/JvHTMLTest.lpi b/components/jvcllaz/examples/JvHTML/JvHTMLTest.lpi index 0f8d72f29..1bd892cc4 100644 --- a/components/jvcllaz/examples/JvHTML/JvHTMLTest.lpi +++ b/components/jvcllaz/examples/JvHTML/JvHTMLTest.lpi @@ -66,7 +66,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvHTMLTest"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvHTMLTest"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvHTML/htmltestform.lfm b/components/jvcllaz/examples/JvHTML/htmltestform.lfm index 62bde8632..fffdb71a9 100644 --- a/components/jvcllaz/examples/JvHTML/htmltestform.lfm +++ b/components/jvcllaz/examples/JvHTML/htmltestform.lfm @@ -7,7 +7,7 @@ object MainForm: TMainForm ClientHeight = 384 ClientWidth = 858 OnShow = FormShow - LCLVersion = '2.1.0.0' + LCLVersion = '2.0.2.0' object PageControl: TPageControl Left = 0 Height = 384 @@ -136,7 +136,7 @@ object MainForm: TMainForm Font.Height = -13 Font.Name = 'Courier New' Font.Pitch = fpFixed - Font.Quality = fqAntialiased + Font.Quality = fqCleartype ParentColor = False ParentFont = False TabOrder = 1 diff --git a/components/jvcllaz/examples/JvHTMLParser/JvHtmlParserProj.lpi b/components/jvcllaz/examples/JvHTMLParser/JvHtmlParserProj.lpi index f1c0e694a..ffdd427a4 100644 --- a/components/jvcllaz/examples/JvHTMLParser/JvHtmlParserProj.lpi +++ b/components/jvcllaz/examples/JvHTMLParser/JvHtmlParserProj.lpi @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> + <Flags> + <CompatibilityMode Value="True"/> + </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="JvHtmlParserProj"/> <Scaled Value="True"/> <ResourceType Value="res"/> @@ -52,7 +54,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvHtmlParserProj"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvHtmlParserProj"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvID3v1/JvID3v1Demo.lpi b/components/jvcllaz/examples/JvID3v1/JvID3v1Demo.lpi index 8c4c5e3f6..0d1f930a5 100644 --- a/components/jvcllaz/examples/JvID3v1/JvID3v1Demo.lpi +++ b/components/jvcllaz/examples/JvID3v1/JvID3v1Demo.lpi @@ -53,7 +53,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvID3v1Demo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvID3v1Demo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvID3v1/JvID3v1MainFormU.lfm b/components/jvcllaz/examples/JvID3v1/JvID3v1MainFormU.lfm index 142613c91..b2d653e5c 100644 --- a/components/jvcllaz/examples/JvID3v1/JvID3v1MainFormU.lfm +++ b/components/jvcllaz/examples/JvID3v1/JvID3v1MainFormU.lfm @@ -18,7 +18,7 @@ object JvID3v1MainForm: TJvID3v1MainForm OnDropFiles = FormDropFiles Position = poScreenCenter ShowHint = True - LCLVersion = '2.1.0.0' + LCLVersion = '1.8.4.0' object lblArtist: TLabel AnchorSideTop.Control = edtArtist AnchorSideTop.Side = asrCenter diff --git a/components/jvcllaz/examples/JvID3v1/JvID3v1MainFormU.pas b/components/jvcllaz/examples/JvID3v1/JvID3v1MainFormU.pas index aec7b33dc..93d81e3c7 100644 --- a/components/jvcllaz/examples/JvID3v1/JvID3v1MainFormU.pas +++ b/components/jvcllaz/examples/JvID3v1/JvID3v1MainFormU.pas @@ -224,7 +224,7 @@ var begin if JvId3v11.FileName > '' then 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 } HasTag := JvId3v11.HasTag; lblHasTag.Font.Color := CHasTagColor[HasTag]; diff --git a/components/jvcllaz/examples/JvID3v2/JvId3v2Demo.lpi b/components/jvcllaz/examples/JvID3v2/JvId3v2Demo.lpi index 5fb3c1fc7..b3f6eff68 100644 --- a/components/jvcllaz/examples/JvID3v2/JvId3v2Demo.lpi +++ b/components/jvcllaz/examples/JvID3v2/JvId3v2Demo.lpi @@ -60,7 +60,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvId3v2Demo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvId3v2Demo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvID3v2/JvId3v2EditFormU.lfm b/components/jvcllaz/examples/JvID3v2/JvId3v2EditFormU.lfm index 334852b9e..4814532fe 100644 --- a/components/jvcllaz/examples/JvID3v2/JvId3v2EditFormU.lfm +++ b/components/jvcllaz/examples/JvID3v2/JvId3v2EditFormU.lfm @@ -12,7 +12,7 @@ object JvID3v2EditForm: TJvID3v2EditForm OnCreate = FormCreate OnShow = FormShow Position = poMainFormCenter - LCLVersion = '2.1.0.0' + LCLVersion = '2.0.2.0' object lsbNavigator: TListBox Left = 4 Height = 479 diff --git a/components/jvcllaz/examples/JvID3v2/JvId3v2EditFormU.pas b/components/jvcllaz/examples/JvID3v2/JvId3v2EditFormU.pas index 4b3b33378..9667bb783 100644 --- a/components/jvcllaz/examples/JvID3v2/JvId3v2EditFormU.pas +++ b/components/jvcllaz/examples/JvID3v2/JvId3v2EditFormU.pas @@ -502,7 +502,7 @@ begin with Frame do begin with cmbPictureType do - PictureType := TJvID3PictureType(Items.Objects[ItemIndex]); + PictureType := TJvID3PictureType(PtrInt(Items.Objects[ItemIndex])); Description := edtPictureName.Text; MIMEType := AnsiString(ExtToMIMEType(ExtractFileExt(FileName))); LoadFromFile(FileName); @@ -571,7 +571,7 @@ begin begin edtPictureName.Text := Frame.Description; with cmbPictureType do - ItemIndex := Items.IndexOfObject(TObject(Frame.PictureType)); + ItemIndex := Items.IndexOfObject(TObject(PtrInt(Frame.PictureType))); end; imgPicture.Picture.Assign(Frame); @@ -590,7 +590,7 @@ begin try Strings.Clear; for PictureType := Low(TJvID3PictureType) to High(TJvID3PictureType) do - Strings.AddObject(CPictureTypeStr[PictureType], TObject(PictureType)); + Strings.AddObject(CPictureTypeStr[PictureType], TObject(PtrInt(PictureType))); finally Strings.EndUpdate; end; @@ -640,7 +640,7 @@ begin with Frame do begin with cmbPictureType do - PictureType := TJvID3PictureType(Items.Objects[ItemIndex]); + PictureType := TJvID3PictureType(PtrInt(Items.Objects[ItemIndex])); Description := edtPictureName.Text; lsvPictures.Items.BeginUpdate; diff --git a/components/jvcllaz/examples/JvInstallLabel/Install2LabelDemo.lpi b/components/jvcllaz/examples/JvInstallLabel/Install2LabelDemo.lpi index a15e2d7d0..2caae1341 100644 --- a/components/jvcllaz/examples/JvInstallLabel/Install2LabelDemo.lpi +++ b/components/jvcllaz/examples/JvInstallLabel/Install2LabelDemo.lpi @@ -57,7 +57,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\Install2LabelDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/Install2LabelDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvInstallLabel/InstallLabelMainFormU.lfm b/components/jvcllaz/examples/JvInstallLabel/InstallLabelMainFormU.lfm index 160e84f7c..332d20dad 100644 --- a/components/jvcllaz/examples/JvInstallLabel/InstallLabelMainFormU.lfm +++ b/components/jvcllaz/examples/JvInstallLabel/InstallLabelMainFormU.lfm @@ -1,59 +1,24 @@ object InstallLabelMainForm: TInstallLabelMainForm Left = 339 - Height = 237 + Height = 226 Top = 142 Width = 293 BorderIcons = [biSystemMenu] BorderStyle = bsSingle Caption = 'Installation in progress' - ClientHeight = 237 + ClientHeight = 226 ClientWidth = 293 - Color = clBtnFace + Color = clForm DefaultMonitor = dmDesktop KeyPreview = True OnCreate = FormCreate Position = poScreenCenter - LCLVersion = '2.1.0.0' + LCLVersion = '1.8.4.0' 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 - Left = 121 + Left = 128 Height = 25 - Top = 204 + Top = 192 Width = 75 Caption = '&Next >>' Default = True @@ -61,9 +26,9 @@ object InstallLabelMainForm: TInstallLabelMainForm TabOrder = 0 end object Button1: TButton - Left = 201 + Left = 208 Height = 25 - Top = 204 + Top = 192 Width = 75 Caption = 'Close' OnClick = Button1Click @@ -71,22 +36,19 @@ object InstallLabelMainForm: TInstallLabelMainForm end object Panel1: TPanel Left = 8 - Height = 146 - Top = 48 + Height = 144 + Top = 40 Width = 276 BevelOuter = bvLowered - ClientHeight = 146 + ClientHeight = 144 ClientWidth = 276 TabOrder = 2 object InstallLabel1: TJvInstallLabel Left = 1 - Height = 144 + Height = 142 Top = 1 Width = 274 Align = alClient - Font.CharSet = ANSI_CHARSET - Font.Color = clBlack - Font.Height = -13 Images = ImageList1 Lines.Strings = ( 'Install JCL' @@ -95,11 +57,58 @@ object InstallLabelMainForm: TInstallLabelMainForm 'Compile JVCL packages' 'Install JVCL into Delphi IDE' ) - ParentFont = False TextOffset = 40 ImageOffset = 8 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 left = 48 top = 8 diff --git a/components/jvcllaz/examples/JvInstallLabel/InstallLabelMainFormU.pas b/components/jvcllaz/examples/JvInstallLabel/InstallLabelMainFormU.pas index ecf13163f..52eb3a7f6 100644 --- a/components/jvcllaz/examples/JvInstallLabel/InstallLabelMainFormU.pas +++ b/components/jvcllaz/examples/JvInstallLabel/InstallLabelMainFormU.pas @@ -32,9 +32,12 @@ interface uses LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, - StdCtrls, ExtCtrls, ImgList, JvInstallLabel; + StdCtrls, ExtCtrls, JvInstallLabel; type + + { TInstallLabelMainForm } + TInstallLabelMainForm = class(TForm) ImageList1: TImageList; Next: TButton; @@ -42,6 +45,7 @@ type Image1: TImage; Panel1: TPanel; InstallLabel1: TJvInstallLabel; + Panel2: TPanel; procedure NextClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure Button1Click(Sender: TObject); diff --git a/components/jvcllaz/examples/JvItemViewer/JvItemViewerDemo.lpi b/components/jvcllaz/examples/JvItemViewer/JvItemViewerDemo.lpi index 6b45e7077..237e13a30 100644 --- a/components/jvcllaz/examples/JvItemViewer/JvItemViewerDemo.lpi +++ b/components/jvcllaz/examples/JvItemViewer/JvItemViewerDemo.lpi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> <Flags> @@ -9,9 +9,9 @@ <MainUnitHasCreateFormStatements Value="False"/> <MainUnitHasTitleStatement Value="False"/> <MainUnitHasScaledStatement Value="False"/> + <CompatibilityMode Value="True"/> </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="JvItemViewerDemo"/> <UseAppBundle Value="False"/> <ResourceType Value="res"/> @@ -65,6 +65,9 @@ <CompilerOptions> <Version Value="11"/> <PathDelim Value="\"/> + <Target> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvItemViewerDemo"/> + </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> @@ -76,6 +79,9 @@ </SyntaxOptions> </Parsing> <Linking> + <Debugging> + <UseExternalDbgSyms Value="True"/> + </Debugging> <Options> <Win32> <GraphicApplication Value="True"/> diff --git a/components/jvcllaz/examples/JvLED/JvLEDDemo.lpi b/components/jvcllaz/examples/JvLED/JvLEDDemo.lpi index 3309c7b46..ce2b1ec74 100644 --- a/components/jvcllaz/examples/JvLED/JvLEDDemo.lpi +++ b/components/jvcllaz/examples/JvLED/JvLEDDemo.lpi @@ -53,7 +53,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvLEDDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvLEDDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvLookupAutoComplete/JvLookupAutoCompleteDemo.lpi b/components/jvcllaz/examples/JvLookupAutoComplete/JvLookupAutoCompleteDemo.lpi index a5d30f91d..85b970d43 100644 --- a/components/jvcllaz/examples/JvLookupAutoComplete/JvLookupAutoCompleteDemo.lpi +++ b/components/jvcllaz/examples/JvLookupAutoComplete/JvLookupAutoCompleteDemo.lpi @@ -54,7 +54,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvLookupAutoCompleteDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvLookupAutoCompleteDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvMarkup/MarkupDemo.lpi b/components/jvcllaz/examples/JvMarkup/MarkupDemo.lpi index fee6fe1a7..b69cbe297 100644 --- a/components/jvcllaz/examples/JvMarkup/MarkupDemo.lpi +++ b/components/jvcllaz/examples/JvMarkup/MarkupDemo.lpi @@ -55,7 +55,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\MarkupDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/MarkupDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi index 8c4393fec..3020524c7 100644 --- a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi +++ b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="12"/> + <Version Value="10"/> <PathDelim Value="\"/> <General> <Flags> <LRSInOutputDirectory Value="False"/> - <CompatibilityMode Value="True"/> </Flags> + <MainUnit Value="0"/> </General> <BuildModes Count="1"> <Item1 Name="default" Default="True"/> @@ -16,14 +16,9 @@ <Version Value="2"/> </PublishOptions> <RunParams> - <FormatVersion Value="2"/> - <Modes Count="1"> - <Mode0 Name="default"> - <local> - <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> - </local> - </Mode0> - </Modes> + <local> + <FormatVersion Value="1"/> + </local> </RunParams> <RequiredPackages Count="2"> <Item1> @@ -33,10 +28,11 @@ <PackageName Value="LCL"/> </Item2> </RequiredPackages> - <Units Count="12"> + <Units Count="14"> <Unit0> <Filename Value="JvNavPaneDemo.lpr"/> <IsPartOfProject Value="True"/> + <IsVisibleTab Value="True"/> <CursorPos X="36" Y="11"/> <UsageCount Value="23"/> <Loaded Value="True"/> @@ -48,10 +44,9 @@ <ComponentName Value="JvNavPaneDemoMainFrm"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> - <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="258"/> - <CursorPos X="22" Y="280"/> + <TopLine Value="310"/> + <CursorPos X="40" Y="423"/> <UsageCount Value="23"/> <Loaded Value="True"/> <LoadedDesigner Value="True"/> @@ -85,15 +80,14 @@ <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> <UnitName Value="JvNavigationPane"/> <EditorIndex Value="2"/> - <TopLine Value="199"/> - <CursorPos X="56" Y="216"/> + <TopLine Value="25"/> <UsageCount Value="10"/> <Loaded Value="True"/> </Unit6> <Unit7> <Filename Value="..\..\run\JvCore\jvjclutils.pas"/> <UnitName Value="JvJCLUtils"/> - <EditorIndex Value="7"/> + <EditorIndex Value="9"/> <TopLine Value="1062"/> <CursorPos X="23" Y="1080"/> <UsageCount Value="10"/> @@ -102,7 +96,7 @@ <Unit8> <Filename Value="C:\lazarus-trunk_fpc304\lcl\lcltype.pp"/> <UnitName Value="LCLType"/> - <EditorIndex Value="6"/> + <EditorIndex Value="8"/> <TopLine Value="230"/> <CursorPos X="3" Y="248"/> <UsageCount Value="10"/> @@ -111,7 +105,7 @@ <Unit9> <Filename Value="C:\lazarus-trunk_fpc304\lcl\graphics.pp"/> <UnitName Value="Graphics"/> - <EditorIndex Value="5"/> + <EditorIndex Value="7"/> <TopLine Value="1125"/> <CursorPos X="14" Y="1141"/> <UsageCount Value="10"/> @@ -120,7 +114,7 @@ <Unit10> <Filename Value="..\..\run\JvCore\jvexcontrols.pas"/> <UnitName Value="JvExControls"/> - <EditorIndex Value="3"/> + <EditorIndex Value="5"/> <TopLine Value="237"/> <CursorPos X="14" Y="254"/> <UsageCount Value="10"/> @@ -129,131 +123,154 @@ <Unit11> <Filename Value="C:\lazarus-trunk_fpc304\lcl\controls.pp"/> <UnitName Value="Controls"/> - <EditorIndex Value="4"/> + <EditorIndex Value="6"/> <TopLine Value="162"/> <CursorPos X="3" Y="180"/> <UsageCount Value="10"/> <Loaded Value="True"/> </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> - <JumpHistory Count="28" HistoryIndex="27"> + <JumpHistory Count="29" HistoryIndex="28"> <Position1> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="2415" Column="83" TopLine="2397"/> + <Caret Line="3787" Column="24" TopLine="3769"/> </Position1> <Position2> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="2420" Column="31" TopLine="2391"/> + <Filename Value="JvNavPaneDemoMainForm.pas"/> + <Caret Line="286" Column="29" TopLine="264"/> </Position2> <Position3> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="2374" TopLine="2374"/> + <Caret Line="645" Column="28" TopLine="618"/> </Position3> <Position4> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> + <Filename Value="JvNavPaneDemoMainForm.pas"/> + <Caret Line="280" Column="22" TopLine="258"/> </Position4> <Position5> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="2415" Column="80" TopLine="2386"/> + <Caret Line="3434" Column="40" TopLine="3425"/> </Position5> <Position6> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3539" Column="26" TopLine="3509"/> + <Caret Line="3443" Column="23" TopLine="3424"/> </Position6> <Position7> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3548" Column="3" TopLine="3515"/> + <Filename Value="JvNavPaneDemoMainForm.pas"/> + <Caret Line="274" Column="34" TopLine="258"/> </Position7> <Position8> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3540" Column="83" TopLine="3523"/> + <Filename Value="JvNavPaneDemoMainForm.pas"/> + <Caret Line="57" Column="54" TopLine="39"/> </Position8> <Position9> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3539" Column="60" TopLine="3522"/> + <Filename Value="JvNavPaneDemoMainForm.pas"/> + <Caret Line="438" Column="3" TopLine="435"/> </Position9> <Position10> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3541" Column="13" TopLine="3522"/> + <Filename Value="JvNavPaneDemoMainForm.pas"/> + <Caret Line="57" Column="15" TopLine="39"/> </Position10> <Position11> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3546" Column="13" TopLine="3522"/> + <Filename Value="JvNavPaneDemoMainForm.pas"/> + <Caret Line="423" Column="40" TopLine="415"/> </Position11> <Position12> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3788" Column="51" TopLine="3757"/> + <Caret Line="2190" Column="37" TopLine="2182"/> </Position12> <Position13> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="4414" Column="17" TopLine="4385"/> + <Caret Line="2197" Column="65" TopLine="2182"/> </Position13> <Position14> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="4901" Column="80" TopLine="4901"/> + <Caret Line="2201" TopLine="2181"/> </Position14> <Position15> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> + <Caret Line="2250" TopLine="2229"/> </Position15> <Position16> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="2415" Column="79" TopLine="2386"/> + <Caret Line="2265" TopLine="2233"/> </Position16> <Position17> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3541" Column="13" TopLine="3511"/> + <Filename Value="D:\lazarus202_fpc304_win64\fpc\3.0.4\source\rtl\inc\objpas.inc"/> + <Caret Line="550" Column="38" TopLine="537"/> </Position17> <Position18> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3546" Column="13" TopLine="3516"/> + <Caret Line="2262" Column="35" TopLine="2233"/> </Position18> <Position19> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3787" Column="13" TopLine="3757"/> + <Caret Line="2265" TopLine="2233"/> </Position19> <Position20> <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="4414" Column="17" TopLine="4385"/> + <Caret Line="2250" TopLine="2233"/> </Position20> <Position21> - <Filename Value="JvNavPaneDemoMainForm.pas"/> - <Caret Line="252" Column="29" TopLine="252"/> + <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> + <Caret Line="2265" TopLine="2233"/> </Position21> <Position22> - <Filename Value="JvNavPaneDemoMainForm.pas"/> - <Caret Line="264" Column="15" TopLine="252"/> + <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> + <Caret Line="2238" Column="31" TopLine="2233"/> </Position22> <Position23> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3787" Column="24" TopLine="3769"/> + <Filename Value="JvNavPaneDemoMainForm.pas"/> + <Caret Line="423" Column="40" TopLine="310"/> </Position23> <Position24> - <Filename Value="JvNavPaneDemoMainForm.pas"/> - <Caret Line="286" Column="29" TopLine="264"/> + <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/> + <Caret Line="94" Column="14" TopLine="76"/> </Position24> <Position25> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="645" Column="28" TopLine="618"/> + <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/> + <Caret Line="81" Column="15" TopLine="76"/> </Position25> <Position26> - <Filename Value="JvNavPaneDemoMainForm.pas"/> - <Caret Line="280" Column="22" TopLine="258"/> + <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/> + <Caret Line="437" Column="3" TopLine="434"/> </Position26> <Position27> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3434" Column="40" TopLine="3425"/> + <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/> + <Caret Line="93" Column="17" TopLine="62"/> </Position27> <Position28> - <Filename Value="..\..\run\JvPageComps\jvnavigationpane.pas"/> - <Caret Line="3443" Column="23" TopLine="3424"/> + <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/> + <Caret Line="322" Column="3" TopLine="320"/> </Position28> + <Position29> + <Filename Value="..\..\run\JvPageComps\jvpagelist.pas"/> + <Caret Line="79" Column="16" TopLine="75"/> + </Position29> </JumpHistory> </ProjectOptions> <CompilerOptions> <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvNavPaneDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvNavPaneDemo"/> </Target> <SearchPaths> <IncludeFiles Value="..\..\resources"/> diff --git a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.lfm b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.lfm index 918459bc2..b2ec400a2 100644 --- a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.lfm +++ b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.lfm @@ -8,7 +8,7 @@ object JvNavPaneDemoMainFrm: TJvNavPaneDemoMainFrm Caption = 'JvNavigationPane Demo' DockSite = True OnCreate = FormCreate - LCLVersion = '2.1.0.0' + LCLVersion = '2.0.2.0' object PopupMenu1: TPopupMenu OnPopup = PopupMenu1Popup left = 92 diff --git a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.pas b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.pas index 7bec40210..1d5922978 100644 --- a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.pas +++ b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.pas @@ -430,9 +430,6 @@ begin NT.CloseButton := ShowCloseButton1.Checked; end; -type - THackForm = class(TCustomForm); - procedure TJvNavPaneDemoMainFrm.DoToolEndDock(Sender, Target: TObject; X, Y: Integer); begin if (Target is TCustomForm) and (Target <> Self) then diff --git a/components/jvcllaz/examples/JvOutlookBar/OLBarDemo.lpi b/components/jvcllaz/examples/JvOutlookBar/OLBarDemo.lpi index 31c576c77..109ecbbe9 100644 --- a/components/jvcllaz/examples/JvOutlookBar/OLBarDemo.lpi +++ b/components/jvcllaz/examples/JvOutlookBar/OLBarDemo.lpi @@ -53,7 +53,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/OLBarDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/OLBarDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvOutlookBarCustomDraw/JvOutlookBarCustomDrawDemo.lpi b/components/jvcllaz/examples/JvOutlookBarCustomDraw/JvOutlookBarCustomDrawDemo.lpi index 9444ca6bb..541c057dc 100644 --- a/components/jvcllaz/examples/JvOutlookBarCustomDraw/JvOutlookBarCustomDrawDemo.lpi +++ b/components/jvcllaz/examples/JvOutlookBarCustomDraw/JvOutlookBarCustomDrawDemo.lpi @@ -55,7 +55,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/JvOutlookBarCustomDrawDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvOutlookBarCustomDrawDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvPicClip/JvPicClipDemo.lpi b/components/jvcllaz/examples/JvPicClip/JvPicClipDemo.lpi index 2ecef76a6..99de5d590 100644 --- a/components/jvcllaz/examples/JvPicClip/JvPicClipDemo.lpi +++ b/components/jvcllaz/examples/JvPicClip/JvPicClipDemo.lpi @@ -54,12 +54,26 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvPicClipDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvPicClipDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </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> <Options> <Win32> diff --git a/components/jvcllaz/examples/JvPicClip/main.lfm b/components/jvcllaz/examples/JvPicClip/main.lfm index 5a608ecc4..7160c5029 100644 --- a/components/jvcllaz/examples/JvPicClip/main.lfm +++ b/components/jvcllaz/examples/JvPicClip/main.lfm @@ -64,7 +64,7 @@ object Form1: TForm1 ParentColor = False end object JvPicClip1: TJvPicClip - left = 96 - top = 32 + Left = 96 + Top = 32 end end diff --git a/components/jvcllaz/examples/JvPicClip/main.pas b/components/jvcllaz/examples/JvPicClip/main.pas index c8bfe6b99..bc9574e1a 100644 --- a/components/jvcllaz/examples/JvPicClip/main.pas +++ b/components/jvcllaz/examples/JvPicClip/main.pas @@ -87,6 +87,8 @@ end; procedure TForm1.CreateCombinedImage(ABitmap: TBitmap; out ANumCols, ANumRows: Integer); +const + FOLDER = '../../design/'; var pic: TPicture; c, r, i: Integer; @@ -95,39 +97,39 @@ var begin L := TStringList.Create; try - L.Add('../design/JvMM/images/tjvbmpanimator.bmp'); //0 - L.Add('../design/JvMM/images/tjvfullcoloraxiscombo.bmp'); - L.Add('../design/JvMM/images/tjvfullcolorcircle.bmp'); - L.Add('../design/JvMM/images/tjvfullcolorcircledialog.bmp'); - L.Add('../design/JvMM/images/tjvfullcolorgroup.bmp'); - L.Add('../design/JvMM/images/tjvfullcolorlabel.bmp'); - L.Add('../design/JvMM/images/tjvfullcolorpanel.bmp'); - L.Add('../design/JvMM/images/tjvfullcolorspacecombo.bmp'); - L.Add('../design/JvMM/images/tjvfullcolortrackbar.bmp'); - L.Add('../design/JvMM/images/tjvgradient.bmp'); - L.Add('../design/JvMM/images/tjvgradientheaderpanel.bmp'); // 10 - L.Add('../design/JvMM/images/tjvid3v2.bmp'); - L.Add('../design/JvMM/images/tjvpicclip.bmp'); - L.Add('../design/JvMM/images/tjvspecialprogress.bmp'); - L.Add('../design/JvHMI/images/tjvdialbutton.bmp'); - L.Add('../design/JvHMI/images/tjvled.bmp'); - L.Add('../design/JvDB/images/tjvdbcalcedit.bmp'); - L.Add('../design/JvDB/images/tjvdbhtlabel.bmp'); - L.Add('../design/JvDB/images/tjvdbsearchcombobox.bmp'); - L.Add('../design/JvDB/images/tjvdbsearchedit.bmp'); - L.Add('../design/JvDB/images/tjvdbtreeview.bmp'); // 20 - L.Add('../design/JvCustomControls/images/tjvimagelistviewer.png'); - L.Add('../design/JvCustomControls/images/tjvimagesviewer.png'); - L.Add('../design/JvCustomControls/images/tjvmoderntabbarpainter.bmp'); - L.Add('../design/JvCustomControls/images/tjvoutlookbar.png'); - L.Add('../design/JvCustomControls/images/tjvownerdrawviewer.png'); - L.Add('../design/JvCustomControls/images/tjvtabbar.bmp'); - L.Add('../design/JvCustomControls/images/tjvthumbimage.png'); - L.Add('../design/JvCustomControls/images/tjvthumbnail.png'); - L.Add('../design/JvCustomControls/images/tjvthumbview.png'); - L.Add('../design/JvCustomControls/images/tjvtimeline.png'); // 30 - L.Add('../design/JvCustomControls/images/tjvtmtimeline.png'); - L.Add('../design/JvCustomControls/images/tjvvalidateedit.png'); // 32 + L.Add(FOLDER + 'JvMM/images/tjvbmpanimator.bmp'); //0 + L.Add(FOLDER + 'JvMM/images/tjvfullcoloraxiscombo.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvfullcolorcircle.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvfullcolorcircledialog.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvfullcolorgroup.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvfullcolorlabel.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvfullcolorpanel.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvfullcolorspacecombo.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvfullcolortrackbar.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvgradient.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvgradientheaderpanel.bmp'); // 10 + L.Add(FOLDER + 'JvMM/images/tjvid3v2.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvpicclip.bmp'); + L.Add(FOLDER + 'JvMM/images/tjvspecialprogress.bmp'); + L.Add(FOLDER + 'JvHMI/images/tjvdialbutton.bmp'); + L.Add(FOLDER + 'JvHMI/images/tjvled.bmp'); + L.Add(FOLDER + 'JvDB/images/tjvdbcalcedit.bmp'); + L.Add(FOLDER + 'JvDB/images/tjvdbhtlabel.bmp'); + L.Add(FOLDER + 'JvDB/images/tjvdbsearchcombobox.bmp'); + L.Add(FOLDER + 'JvDB/images/tjvdbsearchedit.bmp'); + L.Add(FOLDER + 'JvDB/images/tjvdbtreeview.bmp'); // 20 + L.Add(FOLDER + 'JvCustomControls/images/tjvimagelistviewer.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/tjvownerdrawviewer.png'); + L.Add(FOLDER + 'JvCustomControls/images/tjvtabbar.bmp'); + L.Add(FOLDER + 'JvCustomControls/images/tjvthumbimage.png'); + L.Add(FOLDER + 'JvCustomControls/images/tjvthumbnail.png'); + L.Add(FOLDER + 'JvCustomControls/images/tjvthumbview.png'); + L.Add(FOLDER + 'JvCustomControls/images/tjvtimeline.png'); // 30 + L.Add(FOLDER + 'JvCustomControls/images/tjvtmtimeline.png'); + L.Add(FOLDER + 'JvCustomControls/images/tjvvalidateedit.png'); // 32 ANumCols := 8; ANumRows := 4; diff --git a/components/jvcllaz/examples/JvProfiler32/ProfilerDemo.lpi b/components/jvcllaz/examples/JvProfiler32/ProfilerDemo.lpi index b6cd964c7..dc2795877 100644 --- a/components/jvcllaz/examples/JvProfiler32/ProfilerDemo.lpi +++ b/components/jvcllaz/examples/JvProfiler32/ProfilerDemo.lpi @@ -54,7 +54,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/ProfilerDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/ProfilerDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvRollOut/JvRollOutDemo.lpi b/components/jvcllaz/examples/JvRollOut/JvRollOutDemo.lpi index 1083d8306..8a98a7726 100644 --- a/components/jvcllaz/examples/JvRollOut/JvRollOutDemo.lpi +++ b/components/jvcllaz/examples/JvRollOut/JvRollOutDemo.lpi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="10"/> <PathDelim Value="\"/> <General> <SessionStorage Value="InProjectDir"/> @@ -13,18 +13,17 @@ <XPManifest> <DpiAware Value="True"/> </XPManifest> - <Icon Value="0"/> </General> <BuildModes Count="1"> <Item1 Name="Default" Default="True"/> </BuildModes> <PublishOptions> <Version Value="2"/> - <UseFileFilters Value="True"/> </PublishOptions> <RunParams> - <FormatVersion Value="2"/> - <Modes Count="0"/> + <local> + <FormatVersion Value="1"/> + </local> </RunParams> <RequiredPackages Count="1"> <Item1> @@ -49,7 +48,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvRollOutDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvRollOutDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvRollOut/MainFrm.lfm b/components/jvcllaz/examples/JvRollOut/MainFrm.lfm index c81e43673..7b0d37f97 100644 --- a/components/jvcllaz/examples/JvRollOut/MainFrm.lfm +++ b/components/jvcllaz/examples/JvRollOut/MainFrm.lfm @@ -14,7 +14,7 @@ object Form1: TForm1 Menu = MainMenu1 OnCreate = FormCreate Position = poScreenCenter - LCLVersion = '2.1.0.0' + LCLVersion = '1.8.4.0' Scaled = False object Splitter1: TSplitter Cursor = crSizeWE diff --git a/components/jvcllaz/examples/JvRollOut/MainFrm.pas b/components/jvcllaz/examples/JvRollOut/MainFrm.pas index c05ec1fc7..ff39c08c5 100644 --- a/components/jvcllaz/examples/JvRollOut/MainFrm.pas +++ b/components/jvcllaz/examples/JvRollOut/MainFrm.pas @@ -6,8 +6,8 @@ interface uses SysUtils, Classes, Graphics, Controls, Forms, - Dialogs, ExtCtrls, JvRollOut, ImgList, - StdCtrls, ActnList, Menus; //, JvExtComponent; + Dialogs, ExtCtrls, StdCtrls, ActnList, Menus, + JvRollOut; type TForm1 = class(TForm) diff --git a/components/jvcllaz/examples/JvSimScope/JvSimScopeDemo.lpi b/components/jvcllaz/examples/JvSimScope/JvSimScopeDemo.lpi index 8714e393a..37bf27f43 100644 --- a/components/jvcllaz/examples/JvSimScope/JvSimScopeDemo.lpi +++ b/components/jvcllaz/examples/JvSimScope/JvSimScopeDemo.lpi @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> + <Flags> + <CompatibilityMode Value="True"/> + </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="JvSimScopeDemo"/> <Scaled Value="True"/> <ResourceType Value="res"/> @@ -13,7 +15,6 @@ <XPManifest> <DpiAware Value="True"/> </XPManifest> - <Icon Value="0"/> </General> <BuildModes Count="1"> <Item1 Name="Default" Default="True"/> @@ -51,7 +52,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvSimScopeDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvSimScopeDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvSpecialProgress/specialprogress_demo.lpi b/components/jvcllaz/examples/JvSpecialProgress/specialprogress_demo.lpi index b7988f4a3..5b2315e9d 100644 --- a/components/jvcllaz/examples/JvSpecialProgress/specialprogress_demo.lpi +++ b/components/jvcllaz/examples/JvSpecialProgress/specialprogress_demo.lpi @@ -52,7 +52,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/specialprogress_demo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/specialprogress_demo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvSpellChecker/JvSpellCheckerDemo.lpi b/components/jvcllaz/examples/JvSpellChecker/JvSpellCheckerDemo.lpi index 155cf2a42..7090f1f1a 100644 --- a/components/jvcllaz/examples/JvSpellChecker/JvSpellCheckerDemo.lpi +++ b/components/jvcllaz/examples/JvSpellChecker/JvSpellCheckerDemo.lpi @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> + <Flags> + <CompatibilityMode Value="True"/> + </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="JvSpellCheckerDemo"/> <Scaled Value="True"/> <ResourceType Value="res"/> @@ -13,7 +15,6 @@ <XPManifest> <DpiAware Value="True"/> </XPManifest> - <Icon Value="0"/> </General> <BuildModes Count="1"> <Item1 Name="Default" Default="True"/> @@ -41,7 +42,10 @@ <Unit1> <Filename Value="jvspellcheckerform.pas"/> <IsPartOfProject Value="True"/> + <ComponentName Value="frmSpellChecker"/> <HasResources Value="True"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="JvSpellCheckerForm"/> </Unit1> <Unit2> <Filename Value="mainfrm.pas"/> @@ -56,7 +60,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvSpellCheckerDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvSpellCheckerDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvSpellChecker/JvSpellCheckerDemo.lpr b/components/jvcllaz/examples/JvSpellChecker/JvSpellCheckerDemo.lpr index 39d1af8f5..4bc1f8c71 100644 --- a/components/jvcllaz/examples/JvSpellChecker/JvSpellCheckerDemo.lpr +++ b/components/jvcllaz/examples/JvSpellChecker/JvSpellCheckerDemo.lpr @@ -11,6 +11,7 @@ begin {$IF LCL_FullVersion >= 1080000} Application.Scaled := True; {$ENDIF} + Application.Scaled:=True; Application.Initialize; Application.CreateForm(TfrmMain, frmMain); Application.CreateForm(TfrmSpellChecker, frmSpellChecker); diff --git a/components/jvcllaz/examples/JvSpellChecker/jvspellcheckerform.lfm b/components/jvcllaz/examples/JvSpellChecker/jvspellcheckerform.lfm index 6b68857a3..40f3a3963 100644 --- a/components/jvcllaz/examples/JvSpellChecker/jvspellcheckerform.lfm +++ b/components/jvcllaz/examples/JvSpellChecker/jvspellcheckerform.lfm @@ -15,7 +15,7 @@ object frmSpellChecker: TfrmSpellChecker OnCreate = FormCreate OnShow = FormShow Position = poMainFormCenter - LCLVersion = '1.9.0.0' + LCLVersion = '2.1.0.0' Scaled = False object Label1: TLabel AnchorSideLeft.Control = Owner @@ -253,8 +253,8 @@ object frmSpellChecker: TfrmSpellChecker end object alSpell: TActionList OnUpdate = alSpellUpdate - left = 112 - top = 144 + Left = 112 + Top = 144 object acIgnore: TAction Caption = '&Ignore' OnExecute = acIgnoreExecute diff --git a/components/jvcllaz/examples/JvSpellChecker/jvspellcheckerform.pas b/components/jvcllaz/examples/JvSpellChecker/jvspellcheckerform.pas index f4f7a3df8..fc150bf94 100644 --- a/components/jvcllaz/examples/JvSpellChecker/jvspellcheckerform.pas +++ b/components/jvcllaz/examples/JvSpellChecker/jvspellcheckerform.pas @@ -123,14 +123,15 @@ begin end; procedure TfrmSpellChecker.FormCreate(Sender: TObject); -var S:string; +var + S:string; begin ASpellChecker := TJvSpellChecker.Create(self); // 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 - S := ExtractFilePath(Application.ExeName) + 'english.dic'; + S := ExtractFilePath(Application.ExeName) + '../../dict/english.dic'; if not FileExists(S) then - S := '..' + PathDelim + 'Dict' + PathDelim + 'english.dic'; + S := '..' + PathDelim + 'Dict' + PathDelim + '../dict/english.dic'; if FileExists(S) then ASpellChecker.Dictionary := S else diff --git a/components/jvcllaz/examples/JvTMTimeLine/SimpleTLTest1.lpi b/components/jvcllaz/examples/JvTMTimeLine/SimpleTLTest1.lpi index ebb2241f5..23667be68 100644 --- a/components/jvcllaz/examples/JvTMTimeLine/SimpleTLTest1.lpi +++ b/components/jvcllaz/examples/JvTMTimeLine/SimpleTLTest1.lpi @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> + <Flags> + <CompatibilityMode Value="True"/> + </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="SimpleTLTest1"/> <Scaled Value="True"/> <ResourceType Value="res"/> @@ -62,7 +64,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\SimpleTLTest1"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/SimpleTLTest1"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi b/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi index b442d1cfc..a5f6fd435 100644 --- a/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi +++ b/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi @@ -53,7 +53,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvTabBarDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvTabBarDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvTabBar/main.lfm b/components/jvcllaz/examples/JvTabBar/main.lfm index c6addcd81..6d0754366 100644 --- a/components/jvcllaz/examples/JvTabBar/main.lfm +++ b/components/jvcllaz/examples/JvTabBar/main.lfm @@ -82,20 +82,20 @@ object Form1: TForm1 Font.Color = clWindowText DisabledFont.Color = clGrayText SelectedFont.Color = clWindowText - left = 360 - top = 192 + Left = 360 + Top = 192 end object JvTabBarXPPainter1: TJvTabBarXPPainter Font.Color = clWindowText DisabledFont.Color = clGrayText SelectedFont.Color = clWindowText FixedTabSize = 0 - left = 360 - top = 120 + Left = 360 + Top = 120 end object ImageList1: TImageList - left = 208 - top = 120 + Left = 208 + Top = 120 Bitmap = { 4C69040000001000000010000000FFFFFF00FFFFFF00459AD3EF4498D2FF4197 D1FF3F95D1FF3D94D0FF3B93D0FF3B92CFFF3B92CFFF3B92CFFF3D94D0FF4398 @@ -230,12 +230,12 @@ object Form1: TForm1 end object OpenDialog1: TOpenDialog Options = [ofAllowMultiSelect, ofEnableSizing, ofViewDetail] - left = 209 - top = 191 + Left = 209 + Top = 191 end object PopupMenu1: TPopupMenu - left = 77 - top = 109 + Left = 77 + Top = 109 object MenuItem1: TMenuItem Action = AcModernPainter AutoCheck = True @@ -249,8 +249,8 @@ object Form1: TForm1 end object ActionList1: TActionList Images = ImageList1 - left = 78 - top = 184 + Left = 78 + Top = 184 object AcFileOpen: TAction Category = 'File' Caption = 'Open...' @@ -278,8 +278,8 @@ object Form1: TForm1 end end object MainMenu1: TMainMenu - left = 77 - top = 253 + Left = 77 + Top = 253 object MenuItem3: TMenuItem Caption = 'File' object MenuItem4: TMenuItem diff --git a/components/jvcllaz/examples/JvTabBar/main.pas b/components/jvcllaz/examples/JvTabBar/main.pas index 633411f1d..9aacbdc58 100644 --- a/components/jvcllaz/examples/JvTabBar/main.pas +++ b/components/jvcllaz/examples/JvTabBar/main.pas @@ -96,7 +96,7 @@ end; procedure TForm1.FormCreate(Sender: TObject); begin - OpenDialog1.InitialDir := '..' + PathDelim + 'examples' + PathDelim + 'JvTabBar'; + OpenDialog1.InitialDir := '../../examples/JvTabBar'; LoadFile(OpenDialog1.InitialDir + PathDelim + 'main.pas'); LoadFile(OpenDialog1.InitialDir + PathDelim + 'main.lfm'); end; @@ -107,7 +107,7 @@ var info: TTabInfo; 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); end; end; diff --git a/components/jvcllaz/examples/JvTabBar_NotebookPages/JvTabBarDemo_NotebookPages.lpi b/components/jvcllaz/examples/JvTabBar_NotebookPages/JvTabBarDemo_NotebookPages.lpi index 157342fed..8d0379a9f 100644 --- a/components/jvcllaz/examples/JvTabBar_NotebookPages/JvTabBarDemo_NotebookPages.lpi +++ b/components/jvcllaz/examples/JvTabBar_NotebookPages/JvTabBarDemo_NotebookPages.lpi @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> + <Flags> + <CompatibilityMode Value="True"/> + </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="JvTabBarDemo_NotebookPages"/> <Scaled Value="True"/> <ResourceType Value="res"/> @@ -55,7 +57,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvTabBarDemo_NotebookPages"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvTabBarDemo_NotebookPages"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvTabBar_NotebookPages/main.lfm b/components/jvcllaz/examples/JvTabBar_NotebookPages/main.lfm index 616038b7d..92dab5714 100644 --- a/components/jvcllaz/examples/JvTabBar_NotebookPages/main.lfm +++ b/components/jvcllaz/examples/JvTabBar_NotebookPages/main.lfm @@ -7,7 +7,7 @@ object Form1: TForm1 ClientHeight = 438 ClientWidth = 669 OnCreate = FormCreate - LCLVersion = '1.9.0.0' + LCLVersion = '2.1.0.0' object JvTabBar1: TJvTabBar Left = 0 Height = 30 @@ -35,7 +35,7 @@ object Form1: TForm1 Height = 408 Top = 30 Width = 669 - PageIndex = 1 + PageIndex = 0 Align = alClient TabOrder = 1 object lprPage: TPage @@ -1064,8 +1064,9 @@ object Form1: TForm1 DirectiveAttri.Style = [fsBold] CompilerMode = pcmDelphi NestedComments = False - left = 157 - top = 111 + TypeHelpers = True + Left = 157 + Top = 111 end object JvModernTabBarPainter1: TJvModernTabBarPainter Color = clGradientInactiveCaption @@ -1076,22 +1077,22 @@ object Form1: TForm1 DisabledFont.Color = clGrayText SelectedFont.Color = clWindowText SelectedFont.Style = [fsBold] - left = 155 - top = 209 + Left = 155 + Top = 209 end object JvTabBarXPPainter1: TJvTabBarXPPainter Font.Color = clWindowText DisabledFont.Color = clGrayText SelectedFont.Color = clWindowText FixedTabSize = 0 - left = 312 - top = 209 + Left = 312 + Top = 209 end object SynXMLSyn1: TSynXMLSyn DefaultFilter = 'XML Document (*.xml,*.xsd,*.xsl,*.xslt,*.dtd)|*.xml;*.xsd;*.xsl;*.xslt;*.dtd' Enabled = False WantBracesParsed = False - left = 241 - top = 111 + Left = 241 + Top = 111 end end diff --git a/components/jvcllaz/examples/JvTabBar_NotebookPages/main.pas b/components/jvcllaz/examples/JvTabBar_NotebookPages/main.pas index db81d373d..85d13d2b4 100644 --- a/components/jvcllaz/examples/JvTabBar_NotebookPages/main.pas +++ b/components/jvcllaz/examples/JvTabBar_NotebookPages/main.pas @@ -50,7 +50,7 @@ procedure TForm1.FormCreate(Sender: TObject); var dir: String; begin - dir := ExpandFileName(Application.Location + '../examples/JvTabBar_NotebookPages/'); + dir := ExpandFileName(Application.Location + '../../examples/JvTabBar_NotebookPages/'); PasSynEdit.Lines.LoadfromFile(dir + 'main.pas'); XMLSynEdit.Lines.LoadFromFile(dir + 'JvTabBarDemo_NotebookPages.lpi'); Image1.Picture.LoadFromFile(dir + 'JvTabBarDemo_NotebookPages.ico'); diff --git a/components/jvcllaz/examples/JvThumbnail/JvThumbnailDemo.lpi b/components/jvcllaz/examples/JvThumbnail/JvThumbnailDemo.lpi index f7870ac0a..802cab952 100644 --- a/components/jvcllaz/examples/JvThumbnail/JvThumbnailDemo.lpi +++ b/components/jvcllaz/examples/JvThumbnail/JvThumbnailDemo.lpi @@ -66,11 +66,11 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/JvThumbnailDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvThumbnailDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> - <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> + <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Linking> <Debugging> diff --git a/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.lfm b/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.lfm index a4d51d845..c7166d52e 100644 --- a/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.lfm +++ b/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.lfm @@ -13,7 +13,7 @@ object JvThumbnailMainForm: TJvThumbnailMainForm Font.Color = clWindowText OnShow = FormShow Position = poScreenCenter - LCLVersion = '1.9.0.0' + LCLVersion = '2.1.0.0' Scaled = False object PageControl1: TPageControl Left = 0 @@ -879,13 +879,6 @@ object JvThumbnailMainForm: TJvThumbnailMainForm ClientHeight = 24 ClientWidth = 931 TabOrder = 1 - object Bevel1: TBevel - Left = 3 - Height = 18 - Top = 3 - Width = 291 - Align = alLeft - end object ProgressBar: TProgressBar Left = 5 Height = 13 diff --git a/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.pas b/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.pas index 253269f93..3d12c7d1b 100644 --- a/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.pas +++ b/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.pas @@ -100,7 +100,6 @@ type ThumbView: TJVThumbview; Panel5: TPanel; ProgressBar: TProgressBar; - Bevel1: TBevel; procedure BtnEditSelThumbClick(Sender: TObject); procedure BtnStopLoadingClick(Sender: TObject); diff --git a/components/jvcllaz/examples/JvValidateEdit/JvFormatEditDemo.lpi b/components/jvcllaz/examples/JvValidateEdit/JvFormatEditDemo.lpi index 6c0c5384b..b5c4ba6fe 100644 --- a/components/jvcllaz/examples/JvValidateEdit/JvFormatEditDemo.lpi +++ b/components/jvcllaz/examples/JvValidateEdit/JvFormatEditDemo.lpi @@ -53,7 +53,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="../../bin/JvFormatEditDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvFormatEditDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvValidators/JvValidatorsDemo.lpi b/components/jvcllaz/examples/JvValidators/JvValidatorsDemo.lpi index cd904ca58..fadaded1b 100644 --- a/components/jvcllaz/examples/JvValidators/JvValidatorsDemo.lpi +++ b/components/jvcllaz/examples/JvValidators/JvValidatorsDemo.lpi @@ -57,7 +57,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvValidatorsDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvValidatorsDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvWizard/JvWizardDemo.lpi b/components/jvcllaz/examples/JvWizard/JvWizardDemo.lpi index fd8318c24..1028539c0 100644 --- a/components/jvcllaz/examples/JvWizard/JvWizardDemo.lpi +++ b/components/jvcllaz/examples/JvWizard/JvWizardDemo.lpi @@ -55,7 +55,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\JvWizardDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/JvWizardDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvXPBar/XPBarDemo.lpi b/components/jvcllaz/examples/JvXPBar/XPBarDemo.lpi index de5474214..e524357c7 100644 --- a/components/jvcllaz/examples/JvXPBar/XPBarDemo.lpi +++ b/components/jvcllaz/examples/JvXPBar/XPBarDemo.lpi @@ -52,7 +52,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\XPBarDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/XPBarDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvXPCtrls/SimpleDemo.lpi b/components/jvcllaz/examples/JvXPCtrls/SimpleDemo.lpi index d71ddb340..577e45089 100644 --- a/components/jvcllaz/examples/JvXPCtrls/SimpleDemo.lpi +++ b/components/jvcllaz/examples/JvXPCtrls/SimpleDemo.lpi @@ -54,7 +54,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\XPCtrls_SimpleDemo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/XPCtrls_SimpleDemo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/examples/JvYearGrid/YearGrid_Demo.lpi b/components/jvcllaz/examples/JvYearGrid/YearGrid_Demo.lpi index 18609d514..988e865fb 100644 --- a/components/jvcllaz/examples/JvYearGrid/YearGrid_Demo.lpi +++ b/components/jvcllaz/examples/JvYearGrid/YearGrid_Demo.lpi @@ -54,7 +54,7 @@ <Version Value="11"/> <PathDelim Value="\"/> <Target> - <Filename Value="..\..\bin\YearGrid_Demo"/> + <Filename Value="../../bin/$(TargetCPU)-$(TargetOS)/YearGrid_Demo"/> </Target> <SearchPaths> <IncludeFiles Value="$(ProjOutDir)"/> diff --git a/components/jvcllaz/packages/jvruntimedesignlazr.lpk b/components/jvcllaz/packages/jvruntimedesignlazr.lpk index 88d2c516c..917e78c61 100644 --- a/components/jvcllaz/packages/jvruntimedesignlazr.lpk +++ b/components/jvcllaz/packages/jvruntimedesignlazr.lpk @@ -3,7 +3,6 @@ <Package Version="4"> <PathDelim Value="\"/> <Name Value="JvRuntimeDesignLazR"/> - <Type Value="RunAndDesignTime"/> <CompilerOptions> <Version Value="11"/> <PathDelim Value="\"/> diff --git a/components/jvcllaz/run/JvCmp/jvprofilerform.pas b/components/jvcllaz/run/JvCmp/jvprofilerform.pas index 004d68286..23ea46801 100644 --- a/components/jvcllaz/run/JvCmp/jvprofilerform.pas +++ b/components/jvcllaz/run/JvCmp/jvprofilerform.pas @@ -115,6 +115,7 @@ type implementation uses + LCLVersion, {$IFDEF LINUX} baseunix, unix, linux, users, {$ELSE} @@ -462,10 +463,12 @@ end; procedure TProfReport.lvReportColumnClick(Sender: TObject; Column: TListColumn); begin + {$IF LCL_FullVersion >= 2000000} // lvReport.Items.BeginUpdate; lvReport.CustomSort(TLVCompare(@DefSort), Column.Index); OddClick := not OddClick; // lvReport.Items.EndUpdate; + {$IFEND} end; procedure TProfReport.SaveBtnClick(Sender: TObject); diff --git a/components/jvcllaz/run/JvCmp/jvspellerform.pas b/components/jvcllaz/run/JvCmp/jvspellerform.pas index ca9abeaa6..3e55e6680 100644 --- a/components/jvcllaz/run/JvCmp/jvspellerform.pas +++ b/components/jvcllaz/run/JvCmp/jvspellerform.pas @@ -91,7 +91,7 @@ implementation uses StrUtils, - JvConsts, JvResources, JvTypes; + JvConsts, JvResources, JvTypes, JvJCLUtils; {$R *.lfm} diff --git a/components/jvcllaz/run/JvCore/jvjvclutils.pas b/components/jvcllaz/run/JvCore/jvjvclutils.pas index 9e4bfd997..d93ccda0c 100644 --- a/components/jvcllaz/run/JvCore/jvjvclutils.pas +++ b/components/jvcllaz/run/JvCore/jvjvclutils.pas @@ -1701,8 +1701,11 @@ begin begin Dest.Canvas.Brush.Color := clSilver; Dest.Canvas.FillRect(Bounds(0, 0, CellWidth, CellHeight)); - Dest.Canvas.Draw(-(Index mod Cols) * CellWidth, - -(Index div Cols) * CellHeight, Source); + Dest.Canvas.Draw( + -(Index mod Cols) * CellWidth, + -(Index div Cols) * CellHeight, + Source + ); end; Dest.Transparent := Source.Transparent; end; diff --git a/components/jvcllaz/run/JvCtrls/jvcombolistbox.pas b/components/jvcllaz/run/JvCtrls/jvcombolistbox.pas index 11ee13124..1546da1bd 100644 --- a/components/jvcllaz/run/JvCtrls/jvcombolistbox.pas +++ b/components/jvcllaz/run/JvCtrls/jvcombolistbox.pas @@ -69,7 +69,7 @@ unit JvComboListBox; interface uses - LCLIntf, LCLType, + LCLIntf, LCLType, LCLVersion, Classes, Graphics, Controls, Forms, StdCtrls, Menus; @@ -204,9 +204,11 @@ type property OnMouseUp; property OnMouseWheel; property OnMouseWheelDown; + {$IF LCL_FullVersion >= 2000000} property OnMouseWheelHorz; property OnMouseWheelLeft; property OnMouseWheelRight; + {$IFEND} property OnMouseWheelUp; property OnResize; property OnSelectionChange; @@ -464,7 +466,10 @@ begin // draw the combo button GetCursorPos(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 begin // draw frame diff --git a/components/jvcllaz/run/JvCtrls/jvinstalllabel.pas b/components/jvcllaz/run/JvCtrls/jvinstalllabel.pas index 7ffa3499b..73faf3eb5 100644 --- a/components/jvcllaz/run/JvCtrls/jvinstalllabel.pas +++ b/components/jvcllaz/run/JvCtrls/jvinstalllabel.pas @@ -75,9 +75,11 @@ type property Styles[Index: Integer]: TFontStyles read GetStyles write SetStyles; published property Align; - property Font; + property BorderSpacing; property Color default clBtnFace; + property Constraints; property DefaultImage: Integer read FDefaultImage write SetIndex default -1; + property Font; property Images: TCustomImageList read FImageList write SetImageList; property Lines: TStrings read GetLines write SetLines; property LineSpacing: Integer read FLineSpacing write SetLineSpacing default 10; diff --git a/components/jvcllaz/run/JvCtrls/jvrollout.pas b/components/jvcllaz/run/JvCtrls/jvrollout.pas index 6ec969c45..653bc6431 100644 --- a/components/jvcllaz/run/JvCtrls/jvrollout.pas +++ b/components/jvcllaz/run/JvCtrls/jvrollout.pas @@ -41,7 +41,7 @@ unit JvRollOut; interface uses - LCLType, LCLIntf, LMessages, + LCLType, LCLIntf, LMessages, LCLVersion, SysUtils, Classes, Controls, Graphics, ImgList, ExtCtrls, ActnList, Forms, //JvExtComponent, JvThemes; @@ -258,7 +258,9 @@ type property Font; property GroupIndex; property ImageOptions; + {$IF LCL_FullVersion >= 2000000} property ParentBackground default True; + {$IFEND} property ParentColor; property ParentFont; property ParentShowHint; diff --git a/components/jvcllaz/run/JvDB/jvdbcontrols.pas b/components/jvcllaz/run/JvDB/jvdbcontrols.pas index 9c1782a93..75a924d4b 100644 --- a/components/jvcllaz/run/JvDB/jvdbcontrols.pas +++ b/components/jvcllaz/run/JvDB/jvdbcontrols.pas @@ -41,7 +41,7 @@ unit JvDBControls; interface uses - JvBaseEdits, DB, DBCtrls, Classes, LMessages, GroupedEdit; + JvBaseEdits, DB, DBCtrls, Classes, LMessages, LCLVersion, GroupedEdit; type @@ -129,8 +129,10 @@ type property Enabled; property Font; property FormatOnEditing; + {$IF LCL_FullVersion >= 2000000} property ImageIndex; property Images; + {$IFEND} property ButtonWidth; property HideSelection; property Anchors; diff --git a/components/jvcllaz/run/JvHMI/jvled.pas b/components/jvcllaz/run/JvHMI/jvled.pas index a13adf0c9..665292c24 100644 --- a/components/jvcllaz/run/JvHMI/jvled.pas +++ b/components/jvcllaz/run/JvHMI/jvled.pas @@ -115,7 +115,7 @@ type implementation uses - SysUtils; + SysUtils, LCLVersion; {$R ../../resource/jvled.res} @@ -234,7 +234,11 @@ end; procedure TJvCustomLED.DoBlink(Sender: TObject); begin + {$IF LCL_FullVersion >= 2000000} if not IsIconic(Application.Handle) then + {$ELSE} + if not IsIconic(Application.MainForm.Handle) then + {$IFEND} Status := not Status; end; diff --git a/components/jvcllaz/run/JvMM/jvfullcolorspaces.pas b/components/jvcllaz/run/JvMM/jvfullcolorspaces.pas index c77df1b6e..223054db2 100644 --- a/components/jvcllaz/run/JvMM/jvfullcolorspaces.pas +++ b/components/jvcllaz/run/JvMM/jvfullcolorspaces.pas @@ -1433,10 +1433,10 @@ end; procedure TJvDEFColorSpace.AddCustomColor(AColor: TColor; AShortName, APrettyName: string); begin - if FDelphiColors.IndexOfObject(TObject(AColor)) = -1 then + if FDelphiColors.IndexOfObject(TObject(PtrInt(AColor))) = -1 then begin FDelphiColors.Values[AShortName] := APrettyName; - FDelphiColors.Objects[FDelphiColors.IndexOfName(AShortName)] := TObject(AColor); + FDelphiColors.Objects[FDelphiColors.IndexOfName(AShortName)] := TObject(PtrInt(AColor)); end; end; @@ -1447,7 +1447,7 @@ var begin NewColor := clNone; for I := 0 to FDelphiColors.Count - 1 do - if AColor = TColor(FDelphiColors.Objects[I]) then + if AColor = PtrInt(FDelphiColors.Objects[I]) then begin NewColor := AColor; Break; @@ -1512,7 +1512,7 @@ end; function TJvDEFColorSpace.GetColorValue(Index: Integer): TColor; begin if (Index >= 0) and (Index < FDelphiColors.Count) then - Result := TColor(FDelphiColors.Objects[Index]) + Result := PtrInt(FDelphiColors.Objects[Index]) else Result := clNone; end; diff --git a/components/jvcllaz/run/JvMM/jvid3v2base.pas b/components/jvcllaz/run/JvMM/jvid3v2base.pas index a84942af3..565049862 100644 --- a/components/jvcllaz/run/JvMM/jvid3v2base.pas +++ b/components/jvcllaz/run/JvMM/jvid3v2base.pas @@ -3854,7 +3854,7 @@ begin if hfUnsynchronisation in Header.Flags then ApplyUnsynchronisationSchemeOnCurrentStream; - FileStream := TFileStream.Create(FFileName, fmOpenReadWrite or fmShareExclusive); + FileStream := TFileStream.Create(AFileName, fmOpenReadWrite or fmShareExclusive); try OldTagSizeInclHeader := GetTagSizeInclHeader(FileStream); @@ -5151,7 +5151,7 @@ end; procedure TJvID3Frame.DataChanged; begin if Assigned(FController) then - FController.ID3Event(ideFrameChange, Longint(Self)); + FController.ID3Event(ideFrameChange, PtrInt(Self)); end; procedure TJvID3Frame.Error(const Msg: string); diff --git a/components/jvcllaz/run/JvMM/jvid3v2types.pas b/components/jvcllaz/run/JvMM/jvid3v2types.pas index 29c62987e..76f1c4ae3 100644 --- a/components/jvcllaz/run/JvMM/jvid3v2types.pas +++ b/components/jvcllaz/run/JvMM/jvid3v2types.pas @@ -1325,7 +1325,7 @@ end; procedure TJvID3TermFinder.BuildList_ID3Genres; var - I: Integer; + I: PtrInt; begin if Assigned(FLists[ltID3Genres]) then Exit; @@ -1358,7 +1358,7 @@ begin for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do with CID3FrameDefs[FrameID] do if LongTextID[0] <> #0 then - AddObject(string(LongTextID), TObject(FrameID)); + AddObject(string(LongTextID), TObject(PtrInt(FrameID))); end; end; @@ -1378,13 +1378,13 @@ begin for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do with CID3FrameDefs[FrameID] do if ShortTextID[0] <> #0 then - AddObject(string(ShortTextID), TObject(FrameID)); + AddObject(string(ShortTextID), TObject(PtrInt(FrameID))); end; end; procedure TJvID3TermFinder.BuildList_ISO_639_2Code; var - I: Integer; + I: PtrInt; begin if Assigned(FLists[ltISO_639_2Code]) then Exit; @@ -1403,7 +1403,7 @@ end; procedure TJvID3TermFinder.BuildList_ISO_639_2Name; var - I: Integer; + I: PtrInt; begin if Assigned(FLists[ltISO_639_2Name]) then Exit; @@ -1436,7 +1436,7 @@ begin AStrings.AddObject('', TObject(255)); 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]); finally AStrings.EndUpdate; @@ -1464,7 +1464,7 @@ begin Result := -1; if Result >= 0 then - Result := Integer(FLists[ltID3Genres].Objects[Result]) + Result := PtrInt(FLists[ltID3Genres].Objects[Result]) else Result := cDefaultGenre[InclWinampGenres]; end; @@ -1494,7 +1494,7 @@ begin Result := -1; if Result >= 0 then - Result := Integer(FLists[ltID3Genres].Objects[Result]) + Result := PtrInt(FLists[ltID3Genres].Objects[Result]) else Result := CDefaultGenre[InclWinampGenres]; end; @@ -1516,7 +1516,7 @@ begin if I < 0 then Result := fiUnknownFrame else - Result := TJvID3FrameID(FLists[ltID3LongText].Objects[I]); + Result := TJvID3FrameID(PtrInt(FLists[ltID3LongText].Objects[I])); end; function TJvID3TermFinder.ID3ShortTextToFrameID( @@ -1536,7 +1536,7 @@ begin if I < 0 then Result := fiUnknownFrame else - Result := TJvID3FrameID(FLists[ltID3ShortText].Objects[I]); + Result := TJvID3FrameID(PtrInt(FLists[ltID3ShortText].Objects[I])); end; function TJvID3TermFinder.IsFrameOk(const S: AnsiString): Boolean; @@ -1560,7 +1560,7 @@ begin Result := FLists[ltISO_639_2Code].IndexOf(string(AnsiLowerCase(ACode))); if Result >= 0 then - Result := Integer(FLists[ltISO_639_2Code].Objects[Result]); + Result := Integer(PtrInt(FLists[ltISO_639_2Code].Objects[Result])); end; procedure TJvID3TermFinder.ISO_639_2Names(AStrings: TStrings); @@ -1577,7 +1577,7 @@ begin Result := FLists[ltISO_639_2Name].IndexOf(AName); if Result >= 0 then - Result := Integer(FLists[ltISO_639_2Name].Objects[Result]); + Result := PtrInt(FLists[ltISO_639_2Name].Objects[Result]); end; initialization diff --git a/components/jvcllaz/run/JvNet/jvstrtohtml.pas b/components/jvcllaz/run/JvNet/jvstrtohtml.pas index 884468372..98be18342 100644 --- a/components/jvcllaz/run/JvNet/jvstrtohtml.pas +++ b/components/jvcllaz/run/JvNet/jvstrtohtml.pas @@ -32,7 +32,6 @@ interface uses SysUtils, Classes; -// JvComponentBase; type TJvStrToHtml = class(TComponent) // TJvComponent) @@ -58,7 +57,7 @@ function HtmlToString(const Value: string): string; implementation uses - LazUtf8; + LCLVersion, LazUtf8; type TJvHtmlCodeRec = record @@ -408,7 +407,11 @@ begin if P^ in ['a'..'z', 'A'..'Z', '0'..'9', '_', ' '] then Append(P^) else begin + {$IF LCL_FullVersion >= 2000000} ch := UTF8CodePointToUniCode(P, n); + {$ELSE} + ch := UTF8CharacterToUniCode(P, n); + {$IFEND} found := false; for J := Low(Conversions) to High(Conversions) do if ch = Conversions[J].Ch then begin diff --git a/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas b/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas index fe5201370..2690c1088 100644 --- a/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas +++ b/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas @@ -2260,7 +2260,7 @@ end; procedure TJvNavIconButton.ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange); begin - if (Msg.Sender <> Self) and ParentStyleManager then + if (Msg.Sender <> Self) and ParentStyleManager and not (csDestroying in ComponentState) then begin StyleManager := Msg.StyleManager; ParentStyleManager := True; diff --git a/components/jvcllaz/run/JvPageComps/jvtabbar.pas b/components/jvcllaz/run/JvPageComps/jvtabbar.pas index 0f1ee87ce..03437e77a 100644 --- a/components/jvcllaz/run/JvPageComps/jvtabbar.pas +++ b/components/jvcllaz/run/JvPageComps/jvtabbar.pas @@ -67,7 +67,7 @@ type FImageIndex: TImageIndex; FEnabled: Boolean; FVisible: Boolean; - FTag: Integer; + FTag: PtrInt; FData: TObject; FHint: TCaption; FName: string; @@ -121,7 +121,7 @@ type property Modified: Boolean read GetModified write SetModified default False; property Hint: TCaption read FHint write FHint; 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 PopupMenu: TPopupMenu read FPopupMenu write SetPopupMenu; property ShowHint: Boolean read FShowHint write FShowHint default True; diff --git a/components/jvcllaz/run/JvStdCtrls/jvbaseedits.pas b/components/jvcllaz/run/JvStdCtrls/jvbaseedits.pas index f2de5120a..e06b8c5e5 100644 --- a/components/jvcllaz/run/JvStdCtrls/jvbaseedits.pas +++ b/components/jvcllaz/run/JvStdCtrls/jvbaseedits.pas @@ -37,7 +37,8 @@ unit JvBaseEdits; interface uses - Classes, SysUtils, EditBtn, LMessages, CalcForm, Forms, GroupedEdit; + Classes, SysUtils, EditBtn, LMessages, LCLVersion, Forms, + CalcForm, GroupedEdit; type @@ -173,9 +174,11 @@ type property ButtonWidth; property Glyph; property NumGlyphs; + {$IF LCL_FullVersion >= 2000000} property Images; property ImageIndex; property ImageWidth; + {$IFEND} property Action; property DirectInput; property FocusOnButtonClick; @@ -254,9 +257,11 @@ type property DragKind; property Glyph; property NumGlyphs; + {$IF LCL_FullVersion >= 2000000} property Images; property ImageIndex; property ImageWidth; + {$IFEND} property Flat; property ParentBiDiMode; property OnEndDock; diff --git a/components/jvcllaz/run/JvWizard/jvwizard.pas b/components/jvcllaz/run/JvWizard/jvwizard.pas index 9c743840d..501a84fca 100644 --- a/components/jvcllaz/run/JvWizard/jvwizard.pas +++ b/components/jvcllaz/run/JvWizard/jvwizard.pas @@ -337,7 +337,8 @@ interface uses SysUtils, Classes, - Controls, Forms, Graphics, Buttons, ImgList, Types, LMessages, LCLType, LCLIntf, + Controls, Forms, Graphics, Buttons, ImgList, Types, + LMessages, LCLType, LCLIntf, LCLVersion, JvWizardCommon, JvComponent; type @@ -795,7 +796,9 @@ type procedure RepositionButtons; procedure UpdateButtonsStatus; procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND; + {$IF LCL_FullVersion >= 2000000} procedure WMGetDlgCode(var Msg: TLMGetDlgCode); message LM_GETDLGCODE; + {$IFEND} procedure CMDesignHitTest(var Msg: TCMDesignHitTest); message CM_DESIGNHITTEST; function FindNextEnabledPage(PageIndex: Integer; const Step: Integer = 1; CheckDisable: Boolean = True): TJvWizardCustomPage; @@ -2959,10 +2962,12 @@ begin Rect.Bottom := Rect.Bottom - FButtonBarHeight; end; +{$IF LCL_FullVersion >= 2000000} procedure TJvWizard.WMGetDlgCode(var Msg: TLMGetDlgCode); begin Msg.Result := DLGC_WANTALLKEYS or DLGC_WANTARROWS; end; +{$IFEND} procedure TJvWizard.UpdateButtonsStatus; var