From 5848a2067cc44387938af81a28f6d21f0c27037f Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Mon, 4 Jan 2010 12:39:53 +0000
Subject: [PATCH] LCL: TControl.FontChanged: moved AutoSize from TWinControl to
 TControl

git-svn-id: trunk@23367 -
---
 lcl/include/control.inc    | 5 +++++
 lcl/include/wincontrol.inc | 7 +------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index f74000ccce..7e49e66fe8 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -277,6 +277,11 @@ begin
   FParentFont := False;
   Invalidate;
   Perform(CM_FONTCHANGED, 0, 0);
+  if AutoSize then
+  begin
+    InvalidatePreferredSize;
+    AdjustSize;
+  end;
 end;
 
 procedure TControl.ParentFontChanged;
diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index ead01dc070..c02feffe13 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -4532,15 +4532,10 @@ begin
   begin
     TWSWinControlClass(WidgetSetClass).SetFont(Self, Font);
     Exclude(FWinControlFlags, wcfFontChanged);
-    if AutoSize then
-    begin
-      InvalidatePreferredSize;
-      AdjustSize;
-    end;
   end
   else
     Include(FWinControlFlags, wcfFontChanged);
-  inherited;
+  inherited FontChanged(Sender);
   NotifyControls(CM_PARENTFONTCHANGED);
 end;