Skip to content

Commit b2bb736

Browse files
Fixed error building package for Delphi 10.4.2.
Fixed #3 Fixed #4
1 parent a530cde commit b2bb736

File tree

7 files changed

+103
-69
lines changed

7 files changed

+103
-69
lines changed

Demo/GoogleMaps/GoogleMapsTest.dproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
77
<DCC_DependencyCheckOutputName>GoogleMapsTest.exe</DCC_DependencyCheckOutputName>
8-
<ProjectVersion>19.3</ProjectVersion>
8+
<ProjectVersion>19.4</ProjectVersion>
99
<Config Condition="'$(Config)'==''">Debug</Config>
1010
<Base>True</Base>
1111
<TargetedPlatforms>3</TargetedPlatforms>

Demo/GoogleMaps/MainForm.dfm

+1-14
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ object formMain: TformMain
1414
Font.Height = -11
1515
Font.Name = 'Tahoma'
1616
Font.Style = []
17-
OldCreateOrder = True
1817
Position = poScreenCenter
1918
Visible = True
2019
WindowState = wsMaximized
2120
OnCreate = FormCreate
2221
OnDestroy = FormDestroy
2322
OnShow = FormShow
24-
PixelsPerInch = 96
2523
TextHeight = 13
2624
object Splitter1: TSplitter
2725
Left = 0
@@ -40,7 +38,6 @@ object formMain: TformMain
4038
Height = 185
4139
Align = alTop
4240
TabOrder = 0
43-
ExplicitWidth = 1007
4441
object gbMapAttributes: TGroupBox
4542
Left = 737
4643
Top = 1
@@ -354,7 +351,6 @@ object formMain: TformMain
354351
Align = alClient
355352
Caption = 'Markers'
356353
TabOrder = 3
357-
ExplicitWidth = 133
358354
object PageControlMarker: TPageControl
359355
Left = 2
360356
Top = 15
@@ -531,7 +527,7 @@ object formMain: TformMain
531527
Height = 13
532528
Align = alTop
533529
Caption = 'Label'
534-
ExplicitLeft = 0
530+
ExplicitWidth = 25
535531
end
536532
object editMarkerLabel: TEdit
537533
AlignWithMargins = True
@@ -655,8 +651,6 @@ object formMain: TformMain
655651
Caption = 'Add Marker'
656652
TabOrder = 1
657653
OnClick = btnAddMarkerClick
658-
ExplicitLeft = 6
659-
ExplicitTop = 148
660654
end
661655
end
662656
end
@@ -671,7 +665,6 @@ object formMain: TformMain
671665
MapLatitude = 25.767314000000000000
672666
MapLongitude = -80.135694000000000000
673667
BeforeShowMap = EdgeGoogleMapViewerBeforeShowMap
674-
ExplicitWidth = 1007
675668
end
676669
object DBGrid: TDBGrid
677670
Left = 0
@@ -760,7 +753,6 @@ object formMain: TformMain
760753
Height = 47
761754
Align = alBottom
762755
TabOrder = 3
763-
ExplicitWidth = 1007
764756
object ShowMapButton: TButton
765757
AlignWithMargins = True
766758
Left = 109
@@ -793,7 +785,6 @@ object formMain: TformMain
793785
Caption = 'Clear Markers'
794786
TabOrder = 3
795787
OnClick = ButtonClearMarkersClick
796-
ExplicitLeft = 768
797788
end
798789
object DBNavigator: TDBNavigator
799790
AlignWithMargins = True
@@ -805,7 +796,6 @@ object formMain: TformMain
805796
VisibleButtons = [nbFirst, nbPrior, nbNext, nbLast]
806797
Align = alRight
807798
TabOrder = 4
808-
ExplicitLeft = 875
809799
end
810800
object LoadTableButton: TButton
811801
AlignWithMargins = True
@@ -817,7 +807,6 @@ object formMain: TformMain
817807
Caption = 'Load Table'
818808
TabOrder = 2
819809
OnClick = LoadTableButtonClick
820-
ExplicitLeft = 663
821810
end
822811
object Button1: TButton
823812
AlignWithMargins = True
@@ -839,7 +828,6 @@ object formMain: TformMain
839828
Align = alClient
840829
BevelOuter = bvNone
841830
TabOrder = 6
842-
ExplicitWidth = 344
843831
object Label7: TLabel
844832
Left = 0
845833
Top = 0
@@ -858,7 +846,6 @@ object formMain: TformMain
858846
Align = alTop
859847
TabOrder = 0
860848
Text = 'customer.xml'
861-
ExplicitWidth = 338
862849
end
863850
end
864851
end

Demo/GoogleMaps/MainForm.pas

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{ }
33
{ Delphi Google Map Viewer Demo }
44
{ }
5-
{ Copyright (c) 2021 (Ethea S.r.l.) }
5+
{ Copyright (c) 2021-2022 (Ethea S.r.l.) }
66
{ Author: Carlo Barazzetta }
77
{ Contributors: }
88
{ littleearth (https://github.com/littleearth) }
@@ -387,6 +387,6 @@ initialization
387387
//If you have a Google API Key it's time to setup
388388
//TEdgeGoogleMapViewer.RegisterGoogleMapsApiKey('xyz');
389389

390+
{$WARN SYMBOL_PLATFORM OFF}
390391
ReportMemoryLeaksOnShutdown := DebugHook <> 0;
391-
392392
end.

Packages/DelphiGoogleMap.dpk

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package DelphiGoogleMap;
22

33
{$R *.res}
4-
{$R '.\Vcl.EdgeGoogleMap.dcr'}
4+
{$R 'Vcl.EdgeGoogleMap.dcr'}
55
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
66
{$ALIGN 8}
77
{$ASSERTIONS ON}
@@ -33,7 +33,8 @@ package DelphiGoogleMap;
3333
requires
3434
rtl,
3535
vcl,
36-
vcledge;
36+
vcledge,
37+
RESTComponents;
3738

3839
contains
3940
Vcl.GoogleMap in '..\Source\Vcl.GoogleMap.pas';

0 commit comments

Comments
 (0)