fpspreadsheet: Fix compilation with Laz trunk after removal of TCustomCombobox.ReadOnly property.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7451 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-05-13 05:40:13 +00:00
parent fe90b9d7fc
commit 085e3db4fe
2 changed files with 10 additions and 15 deletions

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="10"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="fpsgrid"/> <Title Value="fpsgrid"/>
<UseXPManifest Value="True"/> <UseXPManifest Value="True"/>
<Icon Value="0"/> <Icon Value="0"/>
@ -19,14 +21,12 @@
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IgnoreBinaries Value="False"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<local> <FormatVersion Value="2"/>
<FormatVersion Value="1"/> <Modes Count="1">
</local> <Mode0 Name="default"/>
</Modes>
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="2">
<Item1> <Item1>

View File

@ -3479,14 +3479,9 @@ procedure TsCellCombobox.SetFormatItem(AValue: TsCellFormatItem);
begin begin
FFormatItem := AValue; FFormatItem := AValue;
if FFormatItem in [cfiFontColor, cfiBackgroundColor, cfiBorderColor] then if FFormatItem in [cfiFontColor, cfiBackgroundColor, cfiBorderColor] then
begin inherited Style := csOwnerDrawFixed
inherited Style := csOwnerDrawFixed; else
ReadOnly := true;
end else
begin
inherited Style := csDropdown; inherited Style := csDropdown;
ReadOnly := false;
end;
Populate; Populate;
ExtractFromSheet; ExtractFromSheet;