paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-02 14:00:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed AutoSize of TCustomLabel and TButtonControl with & in the caption (issue #1799)

Browse Source 
git-svn-id: trunk@8861 -
This commit is contained in:
vincents 2006-03-02 20:10:37 +00:00
parent 340a6fcb24
commit d6b62f2146
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/include/customlabel.inc
View File

@ -38,7 +38,7 @@ begin
try
R := Rect(0,0, Width, Height);
OldFont:=SelectObject(DC, Font.Handle);
Flags:=DT_CalcRect or DT_NoPrefix;
Flags:=DT_CalcRect;
if WordWrap then inc(Flags,DT_WordBreak);
DrawText(DC, PChar(Caption), Length(Caption), R, Flags);
SelectObject(DC, OldFont);

1
lcl/interfaces/win32/win32proc.pp
View File

@ -1106,6 +1106,7 @@ begin
winHandle := AWinControl.Handle;
canvasHandle := GetDC(winHandle);
oldFontHandle := SelectObject(canvasHandle, Windows.SendMessage(winHandle, WM_GetFont, 0, 0));
DeleteAmpersands(Text);
Result := Windows.GetTextExtentPoint32(canvasHandle, PChar(Text), Length(Text), textSize);
if Result then
begin