From 7dc3b525156ad27d797ca6930eaa672cb1f1a97d Mon Sep 17 00:00:00 2001 From: skalogryz Date: Sat, 15 May 2010 19:14:57 +0000 Subject: [PATCH] richmemo: fix richmemo initialization. update testsimple git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1222 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/richmemo/richmemofactory.pas | 8 +- .../richmemo/samples/testsimple/project1.lpi | 511 +----------------- .../richmemo/samples/testsimple/project1.lpr | 2 + .../richmemo/samples/testsimple/unit1.lfm | 4 +- .../richmemo/samples/testsimple/unit1.lrs | 2 +- 5 files changed, 24 insertions(+), 503 deletions(-) diff --git a/components/richmemo/richmemofactory.pas b/components/richmemo/richmemofactory.pas index 03d3fd8a3..7da4e4167 100644 --- a/components/richmemo/richmemofactory.pas +++ b/components/richmemo/richmemofactory.pas @@ -23,9 +23,11 @@ var cls : TWSLCLComponentClass; begin Result := True; - {$ifdef LCLWin32}RegisterWSComponent(TCustomRichMemo, TWin32WSCustomRichMemo);{$endif} - {$ifdef LCLCarbon}RegisterWSComponent(TCustomRichMemo, TCarbonWSCustomRichMemo);{$endif} - {$ifdef LCLGtk2}RegisterWSComponent(TCustomRichMemo, TGtk2WSCustomRichMemo);{$endif} + {$ifdef LCLWin32}RegisterWSComponent(TCustomRichMemo, TWin32WSCustomRichMemo); + {$elif LCLCarbon}RegisterWSComponent(TCustomRichMemo, TCarbonWSCustomRichMemo); + {$elif LCLGtk2}RegisterWSComponent(TCustomRichMemo, TGtk2WSCustomRichMemo); + {$else}RegisterWSComponent(TCustomRichMemo, TWSCustomRichMemo); + {$endif} cls:=FindWSComponentClass(TCustomRichMemo); if not Assigned(cls) then RegisterWSComponent(TCustomRichMemo, TWSCustomRichMemo); end; diff --git a/components/richmemo/samples/testsimple/project1.lpi b/components/richmemo/samples/testsimple/project1.lpi index 579b40051..86e272cc7 100644 --- a/components/richmemo/samples/testsimple/project1.lpi +++ b/components/richmemo/samples/testsimple/project1.lpi @@ -3,10 +3,13 @@ + + + + - @@ -32,18 +35,11 @@ - + - - - - - - - @@ -51,505 +47,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -559,6 +72,10 @@ + + + + diff --git a/components/richmemo/samples/testsimple/project1.lpr b/components/richmemo/samples/testsimple/project1.lpr index f484b4d76..160b92954 100644 --- a/components/richmemo/samples/testsimple/project1.lpr +++ b/components/richmemo/samples/testsimple/project1.lpr @@ -9,6 +9,8 @@ uses Interfaces, // this includes the LCL widgetset Forms, Unit1, richmemopackage; +{$R *.res} + begin Application.Initialize; Application.CreateForm(TForm1, Form1); diff --git a/components/richmemo/samples/testsimple/unit1.lfm b/components/richmemo/samples/testsimple/unit1.lfm index ad12850f0..69479a403 100644 --- a/components/richmemo/samples/testsimple/unit1.lfm +++ b/components/richmemo/samples/testsimple/unit1.lfm @@ -1,7 +1,7 @@ object Form1: TForm1 - Left = 196 + Left = 295 Height = 457 - Top = 181 + Top = 168 Width = 634 ActiveControl = RichMemo1 Caption = 'Form1' diff --git a/components/richmemo/samples/testsimple/unit1.lrs b/components/richmemo/samples/testsimple/unit1.lrs index ab4e2197e..71e828838 100644 --- a/components/richmemo/samples/testsimple/unit1.lrs +++ b/components/richmemo/samples/testsimple/unit1.lrs @@ -1,7 +1,7 @@ { This is an automatically generated lazarus resource file } LazarusResources.Add('TForm1','FORMDATA',[ - 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#196#0#6'Height'#3#201#1#3'Top'#3#181#0#5 + 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3''''#1#6'Height'#3#201#1#3'Top'#3#168#0#5 +'Width'#3'z'#2#13'ActiveControl'#7#9'RichMemo1'#7'Caption'#6#5'Form1'#12'Cli' +'entHeight'#3#201#1#11'ClientWidth'#3'z'#2#8'OnCreate'#7#10'FormCreate'#10'L' +'CLVersion'#6#6'0.9.29'#0#9'TRichMemo'#9'RichMemo1'#4'Left'#2#15#6'Height'#3