pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Remove TsFontNameCombobox and TsFontSizeCombobox, use TsCellCombobox instead.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3805 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-11-28 10:51:07 +00:00
parent 2df085549c
commit 8080fd856f
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/fpspreadsheet/examples/fpsctrls_no_install/main.lfm
View File

@ -4,7 +4,7 @@ object Form1: TForm1
Top = 177 Top = 177
Width = 874 Width = 874
Caption = 'Form1' Caption = 'Form1'
ClientHeight = 508 ClientHeight = 503
ClientWidth = 874 ClientWidth = 874
Menu = MainMenu Menu = MainMenu
OnCreate = FormCreate OnCreate = FormCreate
@ -12,7 +12,7 @@ object Form1: TForm1
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 74 Height = 74
Top = 26 Top = 24
Width = 874 Width = 874
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
@ -126,10 +126,10 @@ object Form1: TForm1
end end
object CbLoader: TComboBox object CbLoader: TComboBox
Left = 104 Left = 104
Height = 23 Height = 28
Top = 8 Top = 8
Width = 148 Width = 148
ItemHeight = 15 ItemHeight = 20
ItemIndex = 1 ItemIndex = 1
Items.Strings = ( Items.Strings = (
'Workbook' 'Workbook'
@ -142,17 +142,17 @@ object Form1: TForm1
end end
object Label1: TLabel object Label1: TLabel
Left = 13 Left = 13
Height = 15 Height = 20
Top = 11 Top = 11
Width = 58 Width = 73
Caption = 'Loaded by:' Caption = 'Loaded by:'
ParentColor = False ParentColor = False
end end
end end
object InspectorTabControl: TTabControl object InspectorTabControl: TTabControl
Left = 577 Left = 577
Height = 408 Height = 405
Top = 100 Top = 98
Width = 297 Width = 297
OnChange = InspectorTabControlChange OnChange = InspectorTabControlChange
TabIndex = 0 TabIndex = 0
@ -167,17 +167,18 @@ object Form1: TForm1
end end
object Splitter1: TSplitter object Splitter1: TSplitter
Left = 572 Left = 572
Height = 408 Height = 405
Top = 100 Top = 98
Width = 5 Width = 5
Align = alRight Align = alRight
ResizeAnchor = akRight ResizeAnchor = akRight
end end
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Height = 26 Height = 24
Top = 0 Top = 0
Width = 874 Width = 874
AutoSize = True
Caption = 'ToolBar1' Caption = 'ToolBar1'
Images = ImageList1 Images = ImageList1
TabOrder = 3 TabOrder = 3

11
components/fpspreadsheet/fpspreadsheetctrls.pas
View File

@ -260,7 +260,6 @@ type
procedure SetColorRectWidth(AValue: Integer); procedure SetColorRectWidth(AValue: Integer);
procedure SetFormatItem(AValue: TsCellFormatItem); procedure SetFormatItem(AValue: TsCellFormatItem);
procedure SetWorkbookSource(AValue: TsWorkbookSource); procedure SetWorkbookSource(AValue: TsWorkbookSource);
// procedure UpdateCombo;
protected protected
procedure ApplyFormatToCell(ACell: PCell); virtual; procedure ApplyFormatToCell(ACell: PCell); virtual;
procedure Change; override; procedure Change; override;
@ -362,7 +361,7 @@ type
property Visible; property Visible;
end; end;
(*
{ TsCellFontCombobox } { TsCellFontCombobox }
{@@ TsCellFontCombobox is a combobox for selecting various font properties } {@@ TsCellFontCombobox is a combobox for selecting various font properties }
@ -465,7 +464,7 @@ type
procedure Populate; override; procedure Populate; override;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
end; end; *)
{ TsSpreadsheetInspector } { TsSpreadsheetInspector }
@ -534,7 +533,7 @@ begin
RegisterComponents('FPSpreadsheet', [ RegisterComponents('FPSpreadsheet', [
TsWorkbookSource, TsWorkbookTabControl, TsWorksheetGrid, TsWorkbookSource, TsWorkbookTabControl, TsWorksheetGrid,
TsCellEdit, TsCellIndicator, TsCellCombobox, TsCellEdit, TsCellIndicator, TsCellCombobox,
TsFontNameCombobox, TsFontSizeCombobox, //TsFontNameCombobox, TsFontSizeCombobox,
TsSpreadsheetInspector TsSpreadsheetInspector
]); ]);
end; end;
@ -2024,7 +2023,7 @@ begin
} }
end; end;
*) *)
(*
{------------------------------------------------------------------------------} {------------------------------------------------------------------------------}
{ TsCellFontCombobox } { TsCellFontCombobox }
{------------------------------------------------------------------------------} {------------------------------------------------------------------------------}
@ -2170,7 +2169,7 @@ begin
Add('72'); Add('72');
end; end;
end; end;
*)
{------------------------------------------------------------------------------} {------------------------------------------------------------------------------}
{ TsSpreadsheetInspector } { TsSpreadsheetInspector }