diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas index 867ffcfd1..ca26ea570 100644 --- a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas +++ b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas @@ -3922,16 +3922,14 @@ begin end; end; -initialization -(* - {$I fpspreadsheetctrls.lrs} +initialization RegisterPropertyToSkip(TsSpreadsheetInspector, 'RowHeights', 'For compatibility with older Laz versions.', ''); RegisterPropertyToSkip(TsSpreadsheetInspector, 'ColWidths', 'For compatibility with older Laz versions.', ''); - *) + { Clipboard formats } cfBiff8Format := RegisterclipboardFormat('Biff8'); cfBiff5Format := RegisterClipboardFormat('Biff5'); diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas index 7cbfd2845..f173e0420 100644 --- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas +++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas @@ -827,8 +827,6 @@ var {@@ Cursor for copy operation during drag and drop } crDragCopy: Integer; -//procedure Register; - implementation @@ -6984,26 +6982,16 @@ begin end; end; - (* -{@@ ---------------------------------------------------------------------------- - Registers the worksheet grid in the Lazarus component palette, - page "FPSpreadsheet". --------------------------------------------------------------------------------} -procedure Register; -begin - RegisterComponents('FPSpreadsheet', [TsWorksheetGrid]); -end; *) - initialization - {$I ../../resource/fpsvisual.lrs} + {$I ../../resource/fpsvisual.lrs} // contains the DragCopy cursor fpsutils.ScreenPixelsPerInch := Screen.PixelsPerInch; FillPatternStyle := fsNoFill; - (* + RegisterPropertyToSkip(TsCustomWorksheetGrid, 'ColWidths', 'taken from worksheet', ''); RegisterPropertyToSkip(TsCustomWorksheetGrid, 'RowHeights', 'taken from worksheet', ''); - *) + crDragCopy := 1; //201705; Screen.Cursors[crDragCopy] := LoadCursorFromLazarusResource('cur_dragcopy');