diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-06-20 13:25:21 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-06-20 13:25:21 +0000 |
commit | cda3bbc384b692980d5b9b9046c0909697c39577 (patch) | |
tree | ecb1c55e6652baedad4bb644bcf7357f2348a0bf | |
parent | a7f59dc5a91be14936a1838ed10265365d983e2e (diff) | |
download | fpc-cda3bbc384b692980d5b9b9046c0909697c39577.tar.gz |
* merged on request of Ondrej
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@39244 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | rtl/objpas/classes/dm.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rtl/objpas/classes/dm.inc b/rtl/objpas/classes/dm.inc index 583ee77f0a..9c130a0636 100644 --- a/rtl/objpas/classes/dm.inc +++ b/rtl/objpas/classes/dm.inc @@ -89,7 +89,8 @@ procedure TDataModule.DefineProperties(Filer: TFiler); var Ancestor : TDataModule; - HaveData : Boolean; + HaveData, + HavePPIData: Boolean; begin inherited DefineProperties(Filer); @@ -98,13 +99,14 @@ begin (FDSize.X<>Ancestor.FDSize.X) or (FDSize.Y<>Ancestor.FDSize.Y) or (FDPos.Y<>Ancestor.FDPos.Y) or - (FDPos.X<>Ancestor.FDPos.X) or - (FDPPI<>Ancestor.FDPPI); + (FDPos.X<>Ancestor.FDPos.X); + HavePPIData:=(Assigned(Ancestor) and (FDPPI<>Ancestor.FDPPI)) or + (not Assigned(Ancestor) and (FDPPI<>96)); Filer.DefineProperty('Height', @ReadH, @WriteH, HaveData); Filer.DefineProperty('HorizontalOffset', @ReadL, @WriteL, HaveData); Filer.DefineProperty('VerticalOffset', @ReadT,@WriteT, HaveData); Filer.DefineProperty('Width', @ReadW, @WriteW, HaveData); - Filer.DefineProperty('PPI', @ReadP, @WriteP, HaveData); + Filer.DefineProperty('PPI', @ReadP, @WriteP,HavePPIData); end; procedure TDataModule.GetChildren(Proc: TGetChildProc; Root: TComponent); |