|
@@ -1190,7 +1190,7 @@ var
|
|
var
|
|
var
|
|
iChar: integer;
|
|
iChar: integer;
|
|
begin
|
|
begin
|
|
- if UTF8Pos('&', sMenuCaption) = 0 then
|
|
|
|
|
|
+ if Pos('&', sMenuCaption) = 0 then
|
|
begin
|
|
begin
|
|
Result := sMenuCaption;
|
|
Result := sMenuCaption;
|
|
end
|
|
end
|
|
@@ -1198,15 +1198,15 @@ var
|
|
begin
|
|
begin
|
|
Result := '';
|
|
Result := '';
|
|
iChar := 1;
|
|
iChar := 1;
|
|
- while iChar <= UTF8Length(sMenuCaption) do
|
|
|
|
|
|
+ while iChar <= Length(sMenuCaption) do
|
|
begin
|
|
begin
|
|
- if copy(sMenuCaption, iChar, 1) <> '&' then
|
|
|
|
- Result := Result + copy(sMenuCaption, iChar, 1)
|
|
|
|
|
|
+ if sMenuCaption[iChar] <> '&' then
|
|
|
|
+ Result := Result + sMenuCaption[iChar]
|
|
else
|
|
else
|
|
begin
|
|
begin
|
|
- if iChar < UTF8Length(sMenuCaption) then
|
|
|
|
|
|
+ if iChar < Length(sMenuCaption) then
|
|
begin
|
|
begin
|
|
- if copy(sMenuCaption, iChar + 1, 1) = '&' then
|
|
|
|
|
|
+ if sMenuCaption[iChar + 1] = '&' then
|
|
begin
|
|
begin
|
|
Result := Result + '&';
|
|
Result := Result + '&';
|
|
Inc(iChar);
|
|
Inc(iChar);
|