From f8733358d98ed5e87f87ce59abba3f57637bd08a Mon Sep 17 00:00:00 2001 From: jesus Date: Thu, 25 Jun 2009 19:47:11 +0000 Subject: [PATCH] LCL, fix dbgrid AV and visual problems related to column sizes git-svn-id: trunk@20745 - --- lcl/dbgrids.pas | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas index 9013327477..484c145c97 100644 --- a/lcl/dbgrids.pas +++ b/lcl/dbgrids.pas @@ -3274,20 +3274,15 @@ begin tmpCanvas := GetWorkingCanvas(aGrid.Canvas); tmpCanvas.Font := aGrid.Font; - if tmpCanvas=aGrid.Canvas then begin - if FField<>nil then - result := CalcColumnFieldWidth( - tmpCanvas, - dgTitles in aGrid.Options, - Title.Caption, - Title.Font, - FField) - else - result := AGrid.DefaultColWidth - end else begin - aGrid.InvalidateSizes; - result := DEFCOLWIDTH; - end; + if FField<>nil then + result := CalcColumnFieldWidth( + tmpCanvas, + dgTitles in aGrid.Options, + Title.Caption, + Title.Font, + FField) + else + result := AGrid.DefaultColWidth; if tmpCanvas<>AGrid.Canvas then FreeWorkingCanvas(tmpCanvas);