paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-01 11:32:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

MG: fixed memleaks

Browse Source 
git-svn-id: trunk@1291 -
This commit is contained in:
lazarus 2002-02-09 01:48:13 +00:00
parent 8ccce64f72
commit 259b9b7a86
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/interfaces/gtk/gtkproc.inc
View File

@ -3790,9 +3790,21 @@ Procedure GetTextExtentIgnoringAmpersands(Font : PGDKFont; Str : PChar;
LineLength : Longint; lbearing, rbearing, width, ascent, descent : Pgint);
var
NewStr : PChar;
i: integer;
begin
NewStr := RemoveAmpersands(Str, LineLength);
gdk_text_extents(Font, NewStr, StrLen(NewStr), lbearing, rBearing, width, ascent, descent);
NewStr:=Str;
// first check if Str contains an ampersand:
if (Str<>nil) then begin
i:=0;
while (not (Str[i] in [#0,'&'])) do inc(i);
if Str[i]='&' then begin
NewStr := RemoveAmpersands(Str, LineLength);
end;
end;
gdk_text_extents(Font, NewStr, StrLen(NewStr),
lbearing, rBearing, width, ascent, descent);
if NewStr<>Str then
StrDispose(NewStr);
end;
{------------------------------------------------------------------------------
@ -3974,6 +3986,9 @@ end;
{ =============================================================================
$Log$
Revision 1.142 2002/10/27 11:51:35 lazarus
MG: fixed memleaks
Revision 1.141 2002/10/25 15:27:03 lazarus
AJ: Moved form contents creation to gtkproc for code
reuse between GNOME and GTK, and to make GNOME MDI