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

fpspreadsheet: Switch to lfm resource in some shared demo forms. Modify shared unit "sctrls" to no longer hide inherited method.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4046 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-03-17 12:17:58 +00:00
parent 56373ed329
commit 94bb14c171
6 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
View File

@@ -93,6 +93,7 @@
<Filename Value="..\shared\ssortparamsform.pas"/> <Filename Value="..\shared\ssortparamsform.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<UnitName Value="sSortParamsForm"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="..\shared\scurrencyform.pas"/> <Filename Value="..\shared\scurrencyform.pas"/>
@@ -118,6 +119,13 @@
<CodeGeneration> <CodeGeneration>
<SmartLinkUnit Value="True"/> <SmartLinkUnit Value="True"/>
</CodeGeneration> </CodeGeneration>
<Linking>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions Count="3"> <Exceptions Count="3">

3
components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpr
View File

@@ -7,8 +7,7 @@ uses
cthreads, cthreads,
{$ENDIF}{$ENDIF} {$ENDIF}{$ENDIF}
Interfaces, // this includes the LCL widgetset Interfaces, // this includes the LCL widgetset
Forms, main, Forms, main
scsvparamsform, sformatsettingsform, ssortparamsform, scurrencyform
{ you can add units after this }; { you can add units after this };
{$R *.res} {$R *.res}

8
components/fpspreadsheet/examples/visual/shared/scsvparamsform.pas
View File

@@ -8,7 +8,7 @@ uses
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
ButtonPanel, ExtCtrls, ComCtrls, StdCtrls, ButtonPanel, ExtCtrls, ComCtrls, StdCtrls,
fpsCSV, fpsCSV,
sCtrls, sFormatsettingsForm; sCtrls;
type type
@@ -91,6 +91,8 @@ var
implementation implementation
{$R *.lfm}
uses uses
LConvEncoding, fpsUtils; LConvEncoding, fpsUtils;
@@ -585,8 +587,8 @@ begin
end; end;
end; end;
initialization //initialization
{$I scsvparamsform.lrs} // {$I scsvparamsform.lrs}
end. end.

7
components/fpspreadsheet/examples/visual/shared/sctrls.pas
View File

@@ -14,7 +14,7 @@ type
FEmptyString: String; FEmptyString: String;
FCount: Integer; FCount: Integer;
FShortnames: Boolean; FShortnames: Boolean;
procedure ButtonClick(Sender: TObject); procedure ButtonClickHandler(Sender: TObject);
function CreateMonthDayNamesEditor(var AGrid: TStringGrid): TForm; function CreateMonthDayNamesEditor(var AGrid: TStringGrid): TForm;
protected protected
public public
@@ -51,11 +51,10 @@ constructor TMonthDayNamesEdit.Create(AOwner: TComponent);
begin begin
inherited Create(AOwner); inherited Create(AOwner);
Button.Caption := '...'; Button.Caption := '...';
//ButtonCaption := '...'; OnButtonClick := @ButtonClickHandler;
OnButtonClick := @ButtonClick;
end; end;
procedure TMonthDayNamesEdit.ButtonClick(Sender: TObject); procedure TMonthDayNamesEdit.ButtonClickHandler(Sender: TObject);
var var
F: TForm; F: TForm;
i: Integer; i: Integer;

8
components/fpspreadsheet/examples/visual/shared/sformatsettingsform.pas
View File

@@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
Grids, ButtonPanel, ComCtrls, StdCtrls, Spin, ExtCtrls, Buttons, sCtrls; ButtonPanel, ComCtrls, StdCtrls, Spin, ExtCtrls, Buttons, sCtrls;
type type
{ TFormatSettingsForm } { TFormatSettingsForm }
@@ -82,6 +82,8 @@ var
implementation implementation
{$R *.lfm}
uses uses
fpsUtils, fpsUtils,
sCurrencyForm; sCurrencyForm;
@@ -461,8 +463,8 @@ begin
Result := true; Result := true;
end; end;
initialization //initialization
{$I sformatsettingsform.lrs} // {$I sformatsettingsform.lrs}
end. end.

5
components/fpspreadsheet/examples/visual/shared/ssortparamsform.pas
View File

@@ -46,6 +46,8 @@ var
implementation implementation
{$R *.lfm}
uses uses
fpsutils; fpsutils;
@@ -58,6 +60,7 @@ end;
procedure TSortParamsForm.GridSelectEditor(Sender: TObject; procedure TSortParamsForm.GridSelectEditor(Sender: TObject;
aCol, aRow: Integer; var Editor: TWinControl); aCol, aRow: Integer; var Editor: TWinControl);
begin begin
Unused(aCol, aRow);
if (Editor is TCustomComboBox) then if (Editor is TCustomComboBox) then
(Editor as TCustomComboBox).Style := csDropDownList; (Editor as TCustomComboBox).Style := csDropDownList;
end; end;
@@ -249,8 +252,6 @@ begin
Result := true; Result := true;
end; end;
initialization
{$I ssortparamsform.lrs}
end. end.