diff --git a/.gitattributes b/.gitattributes index 1b7e949bca..2c95095cad 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2766,10 +2766,8 @@ examples/affinetransforms/buy_64.bmp -text examples/affinetransforms/project1.lfm svneol=native#text/plain examples/affinetransforms/project1.lpi svneol=native#text/plain examples/affinetransforms/project1.lpr svneol=native#text/plain -examples/affinetransforms/project1.manifest svneol=native#text/plain -examples/affinetransforms/project1.rc svneol=native#text/plain +examples/affinetransforms/project1.res -text examples/affinetransforms/unit1.lfm svneol=native#text/plain -examples/affinetransforms/unit1.lrs svneol=native#text/plain examples/affinetransforms/unit1.pas svneol=native#text/plain examples/anchordocking/README.txt svneol=native#text/plain examples/anchordocking/anchordocking.lpk svneol=native#text/plain diff --git a/examples/affinetransforms/project1.lpi b/examples/affinetransforms/project1.lpi index aca59e4bea..8b835d476c 100644 --- a/examples/affinetransforms/project1.lpi +++ b/examples/affinetransforms/project1.lpi @@ -2,15 +2,15 @@ - + - + - + @@ -34,11 +34,13 @@ - - + + + + @@ -46,262 +48,264 @@ - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -310,264 +314,264 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -592,15 +596,28 @@ + + + + + + + + - + + + + + + @@ -609,6 +626,9 @@ + + + diff --git a/examples/affinetransforms/project1.lpr b/examples/affinetransforms/project1.lpr index d4164d6499..75718963ce 100644 --- a/examples/affinetransforms/project1.lpr +++ b/examples/affinetransforms/project1.lpr @@ -10,7 +10,7 @@ uses Forms { you can add units after this }, Unit1; -{$IFDEF WINDOWS}{$R project1.rc}{$ENDIF} +{$R *.res} begin Application.Initialize; diff --git a/examples/affinetransforms/project1.manifest b/examples/affinetransforms/project1.manifest deleted file mode 100644 index 515fedeef9..0000000000 --- a/examples/affinetransforms/project1.manifest +++ /dev/null @@ -1,17 +0,0 @@ - - - - Your application description here. - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/affinetransforms/project1.rc b/examples/affinetransforms/project1.rc deleted file mode 100644 index ba97e3e5b1..0000000000 --- a/examples/affinetransforms/project1.rc +++ /dev/null @@ -1,6 +0,0 @@ -#define RT_MANIFEST 24 -#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 -#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2 -#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3 - -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "project1.manifest" diff --git a/examples/affinetransforms/project1.res b/examples/affinetransforms/project1.res new file mode 100644 index 0000000000..e66ecf85fe Binary files /dev/null and b/examples/affinetransforms/project1.res differ diff --git a/examples/affinetransforms/unit1.lfm b/examples/affinetransforms/unit1.lfm index 7b6e3a50b5..c98dfffe09 100644 --- a/examples/affinetransforms/unit1.lfm +++ b/examples/affinetransforms/unit1.lfm @@ -3,12 +3,12 @@ object Form1: TForm1 Height = 385 Top = 449 Width = 682 - ActiveControl = RG.RadioButton0 Caption = 'Form1' ClientHeight = 385 ClientWidth = 682 OnCreate = FormCreate OnDestroy = FormDestroy + Position = poScreenCenter LCLVersion = '0.9.29' object RG: TRadioGroup Left = 504 @@ -26,7 +26,7 @@ object Form1: TForm1 ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 229 + ClientHeight = 230 ClientWidth = 165 ItemIndex = 0 Items.Strings = ( @@ -43,19 +43,19 @@ object Form1: TForm1 TabOrder = 0 end object Label1: TLabel - Left = 522 - Height = 18 + Left = 546 + Height = 16 Top = 288 - Width = 122 + Width = 98 Anchors = [akTop, akRight] Caption = 'Resize the window' ParentColor = False end object Label2: TLabel - Left = 525 - Height = 18 + Left = 549 + Height = 16 Top = 307 - Width = 117 + Width = 93 Anchors = [akTop, akRight] Caption = 'to see differences' ParentColor = False diff --git a/examples/affinetransforms/unit1.lrs b/examples/affinetransforms/unit1.lrs deleted file mode 100644 index 9b8de22431..0000000000 --- a/examples/affinetransforms/unit1.lrs +++ /dev/null @@ -1,26 +0,0 @@ -{ This is an automatically generated lazarus resource file } - -LazarusResources.Add('TForm1','FORMDATA',[ - 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'T'#1#6'Height'#3#129#1#3'Top'#3#193#1#5'W' - +'idth'#3#170#2#13'ActiveControl'#7#15'RG.RadioButton0'#7'Caption'#6#5'Form1' - +#12'ClientHeight'#3#129#1#11'ClientWidth'#3#170#2#8'OnCreate'#7#10'FormCreat' - +'e'#9'OnDestroy'#7#11'FormDestroy'#10'LCLVersion'#6#6'0.9.29'#0#11'TRadioGro' - +'up'#2'RG'#4'Left'#3#248#1#6'Height'#3#248#0#3'Top'#2#16#5'Width'#3#169#0#7 - +'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoFill'#9#7'Caption'#6#12'Mapping mod' - +'e'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6 - +#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSi' - +'zing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkH' - +'orizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScal' - +'eChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'Chil' - +'dSizing.ControlsPerLine'#2#1#12'ClientHeight'#3#229#0#11'ClientWidth'#3#165 - +#0#9'ItemIndex'#2#0#13'Items.Strings'#1#6#11'ANISOTROPIC'#6#9'ISOTROPIC'#6#9 - +'LOENGLISH'#6#9'HIENGLISH'#6#8'LOMETRIC'#6#8'HIMETRIC'#6#5'TWIPS'#6#17'ANISO' - +'TROPIC mirr.'#0#7'OnClick'#7#7'RGClick'#8'TabOrder'#2#0#0#0#6'TLabel'#6'Lab' - +'el1'#4'Left'#3#10#2#6'Height'#2#18#3'Top'#3' '#1#5'Width'#2'z'#7'Anchors'#11 - +#5'akTop'#7'akRight'#0#7'Caption'#6#17'Resize the window'#11'ParentColor'#8#0 - +#0#6'TLabel'#6'Label2'#4'Left'#3#13#2#6'Height'#2#18#3'Top'#3'3'#1#5'Width'#2 - +'u'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#18'to see differences' - +#11'ParentColor'#8#0#0#9'TPaintBox'#2'PB'#4'Left'#2#0#6'Height'#3#129#1#3'To' - +'p'#2#0#5'Width'#3#232#1#5'Align'#7#6'alLeft'#7'Anchors'#11#5'akTop'#6'akLef' - +'t'#7'akRight'#8'akBottom'#0#7'OnPaint'#7#7'PBPaint'#0#0#0 -]); diff --git a/examples/affinetransforms/unit1.pas b/examples/affinetransforms/unit1.pas index 57cf700924..44fc1acadf 100644 --- a/examples/affinetransforms/unit1.pas +++ b/examples/affinetransforms/unit1.pas @@ -34,6 +34,8 @@ var implementation +{$R *.lfm} + { TForm1 } procedure TForm1.FormCreate(Sender: TObject); @@ -144,8 +146,5 @@ begin PB.Invalidate; end; -initialization - {$I unit1.lrs} - end.