paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Undo prev fix of compilation error because it is fixed in grids.pas now. Update title style of TsWorksheetGrid for Win10.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4653 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2016-05-17 11:47:17 +00:00
parent 89caeb5de0
commit 2c01d20390
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
View File

@ -349,7 +349,7 @@ object MainForm: TMainForm
CellFormatItem = cfiFontName CellFormatItem = cfiFontName
WorkbookSource = WorkbookSource WorkbookSource = WorkbookSource
DropDownCount = 24 DropDownCount = 24
ItemIndex = 91 ItemIndex = 44
TabOrder = 0 TabOrder = 0
Text = 'Arial' Text = 'Arial'
end end
@ -619,8 +619,9 @@ object MainForm: TMainForm
Left = 144 Left = 144
Height = 24 Height = 24
Top = 0 Top = 0
Width = 853 Width = 851
Align = alClient Align = alClient
BorderSpacing.Right = 2
BorderSpacing.Bottom = 2 BorderSpacing.Bottom = 2
TabOrder = 1 TabOrder = 1
WantReturns = False WantReturns = False

7
components/fpspreadsheet/examples/visual/fpsctrls/main.pas
View File

@ -407,7 +407,7 @@ implementation
{$R *.lfm} {$R *.lfm}
uses uses
LCLIntf, inifiles, uriparser, LCLIntf, inifiles, uriparser, Grids,
fpsUtils, fpsCSV, fpsUtils, fpsCSV,
sCSVParamsForm, sCurrencyForm, sFormatSettingsForm, sSortParamsForm, sCSVParamsForm, sCurrencyForm, sFormatSettingsForm, sSortParamsForm,
sHyperlinkForm, sNumFormatForm, sSearchForm; sHyperlinkForm, sNumFormatForm, sSearchForm;
@ -732,6 +732,11 @@ begin
AcFileSaveAs.Dialog.Filter := GetFileFormatFilter('|', ';', faWrite, priorityFormats); AcFileSaveAs.Dialog.Filter := GetFileFormatFilter('|', ';', faWrite, priorityFormats);
FSaveFormats := GetSpreadFormats(faWrite, priorityFormats); FSaveFormats := GetSpreadFormats(faWrite, priorityFormats);
{$IFDEF WINDOWS}
if Win32MajorVersion >= 10 then
WorksheetGrid.TitleStyle := tsLazarus;
{$ENDIF}
end; end;
{ Event handler for hyperlinks: it only has to provide the hyperlink data { Event handler for hyperlinks: it only has to provide the hyperlink data

6
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -707,7 +707,7 @@ procedure Register;
implementation implementation
uses uses
Types, LCLType, LCLIntf, LCLProc, LCLVersion, Math, StrUtils, Types, LCLType, LCLIntf, LCLProc, Math, StrUtils,
fpCanvas, fpCanvas,
fpsStrings, fpsUtils, fpsVisualUtils, fpsHTMLUtils, fpsStrings, fpsUtils, fpsVisualUtils, fpsHTMLUtils,
fpsNumFormat; fpsNumFormat;
@ -3999,11 +3999,7 @@ begin
AutoExpandToRow(grow, aeNavigation); AutoExpandToRow(grow, aeNavigation);
AutoExpandToCol(gcol, aeNavigation); AutoExpandToCol(gcol, aeNavigation);
if (grow <> Row) or (gcol <> Col) then if (grow <> Row) or (gcol <> Col) then
{$IF LCL_FULLVERSION < 1070000}
MoveExtend(false, gcol, grow); MoveExtend(false, gcol, grow);
{$ELSE}
MoveExtend(false, gcol, grow, true);
{$ENDIF}
end; end;
// Abort selection because of an error // Abort selection because of an error