From caa329c29e6b3a7d312f1f7aee49fafcad645bd7 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 18 Aug 2002 04:56:58 +0000
Subject: [PATCH] fixed default font

git-svn-id: trunk@2721 -
---
 lcl/graphics.pp        | 12 ++++++++----
 lcl/include/canvas.inc | 17 ++++++++++++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/lcl/graphics.pp b/lcl/graphics.pp
index 614b90fe6d..130190555a 100644
--- a/lcl/graphics.pp
+++ b/lcl/graphics.pp
@@ -500,10 +500,6 @@ type
     procedure BrushChanged(ABrush: TObject);
     procedure FontChanged(AFont: TObject);
     procedure RegionChanged(ARegion: TObject);
-    procedure CreateBrush;
-    procedure CreateFont;
-    Procedure CreatePen;
-    Procedure CreateRegion;
     procedure DeselectHandles;
     function GetCanvasClipRect: TRect;
     Function GetColor: TColor;
@@ -521,6 +517,10 @@ type
     Procedure SetPixel(X,Y : Integer; Value : TColor);
     Procedure SetRegion(value : TRegion);
   protected
+    procedure CreateFont; virtual;
+    procedure CreateBrush;
+    Procedure CreatePen;
+    Procedure CreateRegion;
     procedure CreateHandle; virtual;
     procedure RequiredState(ReqState: TCanvasState);
   public
@@ -586,6 +586,7 @@ type
     function TextHeight(const Text: string): Integer;
     function TextWidth(const Text: string): Integer;
     function HandleAllocated: boolean;
+    function GetUpdatedHandle(ReqState: TCanvasState): HDC;
   public
     property ClipRect: TRect read GetCanvasClipRect;
     property PenPos: TPoint read GetPenPos write SetPenPos;
@@ -962,6 +963,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.66  2003/04/02 13:23:23  mattias
+  fixed default font
+
   Revision 1.65  2003/03/12 14:39:29  mattias
   fixed clipping origin in stretchblt
 
diff --git a/lcl/include/canvas.inc b/lcl/include/canvas.inc
index 76d9b06606..831efbcaf1 100644
--- a/lcl/include/canvas.inc
+++ b/lcl/include/canvas.inc
@@ -72,7 +72,7 @@ Begin
   if Canvas <> nil
   then begin
     Canvas.RequiredState([csHandleValid, csBrushValid]);
-    RequiredState([csHandleValid, csFontValid, csBrushValid]);
+    RequiredState([csHandleValid, csBrushValid]);
 
     SH := Source.Bottom - Source.Top;
     SW := Source.Right - Source.Left;
@@ -740,11 +740,23 @@ begin
   MoveTo(X + TextWidth(Text), Y);
 end;
 
+{------------------------------------------------------------------------------
+  function TCanvas.HandleAllocated: boolean;
+ ------------------------------------------------------------------------------}
 function TCanvas.HandleAllocated: boolean;
 begin
   Result:=(FHandle<>0);
 end;
 
+{------------------------------------------------------------------------------
+  function TCanvas.GetUpdatedHandle(ReqState: TCanvasState): HDC;
+ ------------------------------------------------------------------------------}
+function TCanvas.GetUpdatedHandle(ReqState: TCanvasState): HDC;
+begin
+  RequiredState(ReqState+[csHandleValid]);
+  Result:=FHandle;
+end;
+
 {------------------------------------------------------------------------------
   Method:   TCanvas.MoveTo
   Params:   X1,Y1
@@ -1157,6 +1169,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.43  2003/04/02 13:23:23  mattias
+  fixed default font
+
   Revision 1.42  2003/03/12 14:39:29  mattias
   fixed clipping origin in stretchblt