From e81f58a39e7d7a8d78200f53a5b91d5c544cfa5a Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 3 Aug 2007 10:07:18 +0000
Subject: [PATCH] gtk2 intf: fixed GetTextExtentIgnoringAmpersands checking for
 line end

git-svn-id: trunk@11724 -
---
 lcl/interfaces/gtk/gtkproc.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc
index 08dfbc76f1..ac2186c8fa 100644
--- a/lcl/interfaces/gtk/gtkproc.inc
+++ b/lcl/interfaces/gtk/gtkproc.inc
@@ -9259,10 +9259,12 @@ end;
   That means, ampersands are not counted.
 -------------------------------------------------------------------------------}
 {$Ifdef GTK2}
-Procedure GetTextExtentIgnoringAmpersands(FontDesc : PPangoFontDescription; Str : PChar;
+Procedure GetTextExtentIgnoringAmpersands(FontDesc : PPangoFontDescription;
+  Str : PChar;
   LineLength : Longint; lbearing, rbearing, width, ascent, descent : Pgint);
 {$Else}
-Procedure GetTextExtentIgnoringAmpersands(FontDesc : PGDKFont; Str : PChar;
+Procedure GetTextExtentIgnoringAmpersands(FontDesc : PGDKFont;
+  Str : PChar;
   LineLength : Longint; lbearing, rbearing, width, ascent, descent : Pgint);
 {$EndIf}
 var
@@ -9273,8 +9275,8 @@ begin
   // 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
+    while (Str[i]<>'&') and (i<LineLength) do inc(i);
+    if i<LineLength then begin
       NewStr := RemoveAmpersands(Str, LineLength);
       LineLength:=StrLen(NewStr);
     end;