From: Olivier S. <ob...@us...> - 2005-06-12 18:52:30
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5369/dev/JVCL3/run Modified Files: JvJVCLUtils.pas Log Message: Mantis 2898 and 3002: the fix from 2898 is now back in. Index: JvJVCLUtils.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJVCLUtils.pas,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** JvJVCLUtils.pas 12 Jun 2005 18:08:51 -0000 1.167 --- JvJVCLUtils.pas 12 Jun 2005 18:52:20 -0000 1.168 *************** *** 7400,7403 **** --- 7400,7404 ---- OldFontColor: TColor; OldBrushColor: TColor; + OldBrushStyle: TBrushStyle; OldAlignment: TAlignment; OldFont: TFont; *************** *** 7515,7518 **** --- 7516,7520 ---- OldFontColor := 0; OldBrushColor := 0; + OldBrushStyle := bsClear; RemFontSize := 0; RemFontColor := 0; *************** *** 7526,7529 **** --- 7528,7532 ---- OldFontColor := Canvas.Font.Color; OldBrushColor := Canvas.Brush.Color; + OldBrushStyle := Canvas.Brush.Style; OldAlignment := Alignment; RemFontColor := Canvas.Font.Color; *************** *** 7702,7705 **** --- 7705,7709 ---- Canvas.Font.Color := OldFontColor; Canvas.Brush.Color := OldBrushColor; + Canvas.Brush.Style := OldBrushStyle; Alignment := OldAlignment; { Canvas.Font.Color := RemFontColor; |