From 085e3db4fea5ece598240542b7aec7038b8dd22a Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 13 May 2020 05:40:13 +0000 Subject: [PATCH] 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 --- .../examples/visual/fpsgrid/fpsgrid.lpi | 16 ++++++++-------- .../source/visual/fpspreadsheetctrls.pas | 9 ++------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi index 827dc478c..c27c3e3ff 100644 --- a/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi +++ b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi @@ -1,11 +1,13 @@ - + + + + - <UseXPManifest Value="True"/> <Icon Value="0"/> @@ -19,14 +21,12 @@ </BuildModes> <PublishOptions> <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> <RunParams> - <local> - <FormatVersion Value="1"/> - </local> + <FormatVersion Value="2"/> + <Modes Count="1"> + <Mode0 Name="default"/> + </Modes> </RunParams> <RequiredPackages Count="2"> <Item1> diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas index 2479f4b80..75452296c 100644 --- a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas +++ b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas @@ -3479,14 +3479,9 @@ procedure TsCellCombobox.SetFormatItem(AValue: TsCellFormatItem); begin FFormatItem := AValue; if FFormatItem in [cfiFontColor, cfiBackgroundColor, cfiBorderColor] then - begin - inherited Style := csOwnerDrawFixed; - ReadOnly := true; - end else - begin + inherited Style := csOwnerDrawFixed + else inherited Style := csDropdown; - ReadOnly := false; - end; Populate; ExtractFromSheet;