Skip to content

Commit a8ef7c3

Browse files
blikblumblikblum
committed
Advanced: fix compilation
1 parent 3c0c76f commit a8ef7c3

File tree

2 files changed

+8
-33
lines changed

2 files changed

+8
-33
lines changed

‎Demos/Advanced/Main.lfm‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object MainForm: TMainForm
1414
OnCreate = FormCreate
1515
OnShow = FormShow
1616
Position = poScreenCenter
17-
LCLVersion = '0.9.29'
17+
LCLVersion = '1.7'
1818
object PageScroller1: TPanel
1919
Left = 0
2020
Height = 77
@@ -47,7 +47,6 @@ object MainForm: TMainForm
4747
Top = 2
4848
Width = 70
4949
BorderSpacing.Top = 2
50-
Color = clBtnFace
5150
Glyph.Data = {
5251
360D0000424D360D000000000000360400002800000030000000300000000100
5352
0800000000000009000000000000000000000001000000010000000000000000
@@ -157,7 +156,6 @@ object MainForm: TMainForm
157156
E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
158157
}
159158
GroupIndex = 1
160-
NumGlyphs = 0
161159
OnClick = DemoButtonClick
162160
end
163161
object AbilitiesDemoButton: TSpeedButton
@@ -168,7 +166,6 @@ object MainForm: TMainForm
168166
Top = 2
169167
Width = 70
170168
BorderSpacing.Top = 2
171-
Color = clBtnFace
172169
Glyph.Data = {
173170
360D0000424D360D000000000000360400002800000030000000300000000100
174171
0800000000000009000000000000000000000001000000010000FFFFFF005858
@@ -278,7 +275,6 @@ object MainForm: TMainForm
278275
0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
279276
}
280277
GroupIndex = 1
281-
NumGlyphs = 0
282278
OnClick = DemoButtonClick
283279
end
284280
object PropertiesDemoButton: TSpeedButton
@@ -289,7 +285,6 @@ object MainForm: TMainForm
289285
Top = 2
290286
Width = 70
291287
BorderSpacing.Top = 2
292-
Color = clBtnFace
293288
Glyph.Data = {
294289
36140000424D3614000000000000360400002800000040000000400000000100
295290
0800000000000010000000000000000000000001000000010000000000000000
@@ -455,7 +450,6 @@ object MainForm: TMainForm
455450
E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
456451
}
457452
GroupIndex = 1
458-
NumGlyphs = 0
459453
OnClick = DemoButtonClick
460454
end
461455
object VisibilityDemoButton: TSpeedButton
@@ -466,7 +460,6 @@ object MainForm: TMainForm
466460
Top = 2
467461
Width = 70
468462
BorderSpacing.Top = 2
469-
Color = clBtnFace
470463
Glyph.Data = {
471464
360D0000424D360D000000000000360400002800000030000000300000000100
472465
080000000000000900000000000000000000000100000001000000000000040C
@@ -576,7 +569,6 @@ object MainForm: TMainForm
576569
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCCCCC
577570
}
578571
GroupIndex = 1
579-
NumGlyphs = 0
580572
OnClick = DemoButtonClick
581573
end
582574
object GridDemoButton: TSpeedButton
@@ -587,7 +579,6 @@ object MainForm: TMainForm
587579
Top = 2
588580
Width = 70
589581
BorderSpacing.Top = 2
590-
Color = clBtnFace
591582
Glyph.Data = {
592583
360D0000424D360D000000000000360400002800000030000000300000000100
593584
0800000000000009000000000000000000000001000000010000000000000800
@@ -697,7 +688,6 @@ object MainForm: TMainForm
697688
0000000000000000000000000000000000000000000000000000
698689
}
699690
GroupIndex = 1
700-
NumGlyphs = 0
701691
OnClick = DemoButtonClick
702692
end
703693
object PaintTreeDemoButton: TSpeedButton
@@ -708,7 +698,6 @@ object MainForm: TMainForm
708698
Top = 2
709699
Width = 70
710700
BorderSpacing.Top = 2
711-
Color = clBtnFace
712701
Glyph.Data = {
713702
360D0000424D360D000000000000360400002800000030000000300000000100
714703
0800000000000009000000000000000000000001000000010000FFFFFF00FFFF
@@ -818,7 +807,6 @@ object MainForm: TMainForm
818807
FFFFFFFFFFFFFFFFFFFFFFFFFFFFF62626262626262626262626
819808
}
820809
GroupIndex = 1
821-
NumGlyphs = 0
822810
OnClick = DemoButtonClick
823811
end
824812
object AlignDemoButton: TSpeedButton
@@ -829,7 +817,6 @@ object MainForm: TMainForm
829817
Top = 2
830818
Width = 70
831819
BorderSpacing.Top = 2
832-
Color = clBtnFace
833820
Glyph.Data = {
834821
36140000424D3614000000000000360400002800000040000000400000000100
835822
0800000000000010000000000000000000000001000000010000000000000000
@@ -995,14 +982,13 @@ object MainForm: TMainForm
995982
E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
996983
}
997984
GroupIndex = 1
998-
NumGlyphs = 0
999985
OnClick = DemoButtonClick
1000986
end
1001987
object Label1: TLabel
1002988
Left = 0
1003-
Height = 14
989+
Height = 13
1004990
Top = 14
1005-
Width = 76
991+
Width = 72
1006992
Caption = 'Demo picker'
1007993
Font.Height = -11
1008994
Font.Name = 'MS Sans Serif'
@@ -1012,9 +998,9 @@ object MainForm: TMainForm
1012998
end
1013999
object Label2: TLabel
10141000
Left = 0
1015-
Height = 18
1001+
Height = 16
10161002
Top = 30
1017-
Width = 217
1003+
Width = 196
10181004
Caption = 'Which demo do you want to see?'
10191005
ParentColor = False
10201006
end
@@ -1026,7 +1012,6 @@ object MainForm: TMainForm
10261012
Top = 2
10271013
Width = 70
10281014
BorderSpacing.Top = 2
1029-
Color = clBtnFace
10301015
Glyph.Data = {
10311016
361B0000424D361B000000000000360000002800000030000000300000000100
10321017
180000000000001B0000120B0000120B00000000000000000000FF00FFFF00FF
@@ -1248,7 +1233,6 @@ object MainForm: TMainForm
12481233
00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
12491234
}
12501235
GroupIndex = 1
1251-
NumGlyphs = 0
12521236
OnClick = DemoButtonClick
12531237
end
12541238
object XPDemoButton: TSpeedButton
@@ -1259,7 +1243,6 @@ object MainForm: TMainForm
12591243
Top = 2
12601244
Width = 70
12611245
BorderSpacing.Top = 2
1262-
Color = clBtnFace
12631246
Glyph.Data = {
12641247
96270000424D962700000000000036000000280000003C000000380000000100
12651248
18000000000060270000120B0000120B00000000000000000000FF00FFFF00FF
@@ -1580,7 +1563,6 @@ object MainForm: TMainForm
15801563
00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
15811564
}
15821565
GroupIndex = 1
1583-
NumGlyphs = 0
15841566
OnClick = DemoButtonClick
15851567
end
15861568
object SpeedButton2: TSpeedButton
@@ -1591,7 +1573,6 @@ object MainForm: TMainForm
15911573
Top = 2
15921574
Width = 70
15931575
BorderSpacing.Top = 2
1594-
Color = clBtnFace
15951576
Glyph.Data = {
15961577
361F0000424D361F000000000000360000002800000029000000400000000100
15971578
180000000000001F0000120B0000120B00000000000000000000FFFFFF4634D5
@@ -1845,7 +1826,6 @@ object MainForm: TMainForm
18451826
FFFFFFFFFFFFFFFFFFFFFFFFFFFAF8F7E2D4D0E7E0DEFFFFFF00
18461827
}
18471828
GroupIndex = 1
1848-
NumGlyphs = 0
18491829
OnClick = DemoButtonClick
18501830
end
18511831
object QuitButton: TSpeedButton
@@ -1856,7 +1836,6 @@ object MainForm: TMainForm
18561836
Top = 2
18571837
Width = 70
18581838
BorderSpacing.Top = 2
1859-
Color = clBtnFace
18601839
Glyph.Data = {
18611840
360D0000424D360D000000000000360400002800000030000000300000000100
18621841
0800000000000009000000000000000000000001000000010000FFFFFF00AAAA
@@ -1966,21 +1945,20 @@ object MainForm: TMainForm
19661945
D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7
19671946
}
19681947
GroupIndex = 1
1969-
NumGlyphs = 0
19701948
OnClick = QuitButtonClick
19711949
end
19721950
end
19731951
end
19741952
object StatusBar: TStatusBar
19751953
Left = 0
1976-
Height = 21
1977-
Top = 562
1954+
Height = 23
1955+
Top = 560
19781956
Width = 981
19791957
Panels = <>
19801958
end
19811959
object ContainerPanel: TPanel
19821960
Left = 0
1983-
Height = 485
1961+
Height = 483
19841962
Top = 77
19851963
Width = 981
19861964
Align = alClient

‎Demos/Advanced/Main.pas‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ procedure TMainForm.FormShow(Sender: TObject);
173173

174174
//----------------------------------------------------------------------------------------------------------------------
175175

176-
initialization
177-
{$i unicode.lrs}
178-
179176
end.
180177

181178

0 commit comments

Comments
 (0)