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

fix bug #713 (from martin smat)

Browse Source 
git-svn-id: trunk@7499 -
This commit is contained in:
micha 2005-08-13 20:54:40 +00:00
parent 2c86e14b87
commit 866281974f
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/interfaces/win32/win32wsmenus.pp
View File

@ -225,7 +225,7 @@ begin
begin
fType:=MFT_STRING;
newCaption:=AMenuItem.Caption;
if AMenuItem.ShortCut <> 0 then
if AMenuItem.ShortCut <> scNone then
newCaption:=newCaption+#9+ShortCutToText(AMenuItem.ShortCut);
dwTypeData:=LPSTR(newCaption);
cch:=Length(newCaption);
@ -280,7 +280,7 @@ procedure TWin32WSMenuItem.SetCaption(const AMenuItem: TMenuItem; const ACaption
var newCaption: string;
begin
newCaption := ACaption;
if AMenuItem.ShortCut <> 0 then
if AMenuItem.ShortCut <> scNone then
newCaption := newCaption+#9+ShortCutToText(AMenuItem.ShortCut);
UpdateCaption(AMenuItem, newCaption);
end;
@ -288,17 +288,12 @@ end;
procedure TWin32WSMenuItem.SetShortCut(const AMenuItem: TMenuItem;
const OldShortCut, NewShortCut: TShortCut);
var
NewKey: word;
NewModifier: TShiftState;
NewCaption: string;
begin
UpdateCaption(AMenuItem, AMenuItem.Caption+#9+ShortCutToText(NewShortCut));
if (AMenuItem.Owner is TWinControl) and AMenuItem.HandleAllocated then
begin
ShortCutToKey(NewShortCut, NewKey, NewModifier);
SetAccelKey(TWinControl(AMenuItem.Owner).Handle, AMenuItem.Command, NewKey, NewModifier);
end else begin
DebugLn('TWin32WSMenuItem.SetShortCut: unable to set shortcut, menu has no window handle');
end;
NewCaption := AMenuItem.Caption;
if NewShortCut <> scNone then
NewCaption := NewCaption + #9 + ShortCutToText(NewShortCut);
UpdateCaption(AMenuItem, NewCaption);
end;
function TWin32WSMenuItem.SetCheck(const AMenuItem: TMenuItem; const Checked: boolean): boolean;