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

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4046 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi

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

components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpr

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

components/fpspreadsheet/examples/visual/shared/scsvparamsform.pas

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

components/fpspreadsheet/examples/visual/shared/sctrls.pas

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

components/fpspreadsheet/examples/visual/shared/sformatsettingsform.pas

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

components/fpspreadsheet/examples/visual/shared/ssortparamsform.pas

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