paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-04 05:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 58428 #b9a983f064 from trunk:

Browse Source 
Examples: Fix uninitialized variable issue in gridexamples/merged_cells (https://forum.lazarus.freepascal.org/index.php/topic,41757.msg290284)
........

git-svn-id: branches/fixes_1_8@58726 -
This commit is contained in:
maxim 2018-08-16 22:36:06 +00:00
parent 67593511e2
commit 2e62d0daaa
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/gridexamples/merged_cells/mcgrid.pas
View File

@ -66,7 +66,8 @@ var
R: TRect;
begin
inherited;
if goColSpanning in Options then begin
if (goColSpanning in Options) and Assigned(Editor) then begin
R := CellRect(Col, Row);
CalcCellExtent(Col, Row, R);
Editor.SetBounds(R.Left, R.Top, R.Right-R.Left-1, R.Bottom-R.Top-1);
end;

13
examples/gridexamples/merged_cells/mergedcells_project.lpi
View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<PathDelim Value="\"/>
<Version Value="11"/>
<General>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
@ -17,9 +16,10 @@
<Version Value="2"/>
</PublishOptions>
<RunParams>
<local>
<FormatVersion Value="1"/>
</local>
<FormatVersion Value="2"/>
<Modes Count="1">
<Mode0 Name="default"/>
</Modes>
</RunParams>
<RequiredPackages Count="1">
<Item1>
@ -46,13 +46,12 @@
</ProjectOptions>
<CompilerOptions>
<Version Value="11"/>
<PathDelim Value="\"/>
<Target>
<Filename Value="mergedcells_project"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Options>