From 0f2bfd72114aeabe01ca57904f2600a8e4858b97 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Thu, 3 Dec 2009 07:47:02 +0000
Subject: [PATCH] lcl: don't store Color property if Parent=nil but ParentColor
 = False - this causes ancestor frames which have no parent to load wrong
 clWindow color

git-svn-id: trunk@22933 -
---
 lcl/controls.pp         | 1 -
 lcl/include/control.inc | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lcl/controls.pp b/lcl/controls.pp
index 31501c0708..f1751e4fb9 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -972,7 +972,6 @@ type
     function IsAnchorsStored: boolean;
     function IsBiDiModeStored: boolean;
     function IsCaptionStored: Boolean;
-    function IsColorStored: Boolean;
     function IsEnabledStored: Boolean;
     function IsFontStored: Boolean;
     function IsHintStored: Boolean;
diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index 66ea14e8de..89e4e571cd 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -888,7 +888,7 @@ end;
 ------------------------------------------------------------------------------}
 function TControl.ColorIsStored: boolean;
 begin
-  Result := not ParentColor or (Parent = nil);
+  Result := not ParentColor;
 end;
 
 {------------------------------------------------------------------------------
@@ -2823,11 +2823,6 @@ begin
   MouseCapture := False;
 end;
 
-function TControl.IsColorStored: Boolean;
-begin
-  Result := not ParentColor;
-end;
-
 function TControl.IsEnabledStored: Boolean;
 begin
   Result := (ActionLink = nil) or not ActionLink.IsEnabledLinked;