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

fix menu items not firing in win95 and NT (issue #7655, patch from msmat)

Browse Source 
git-svn-id: trunk@10227 -
This commit is contained in:
micha 2006-11-21 21:46:15 +00:00
parent ecd3879ac4
commit eb03426f43
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/interfaces/win32/win32callback.inc
View File

@ -257,13 +257,21 @@ Var
end; end;
function GetMenuItemObject: TObject; function GetMenuItemObject: TObject;
var MenuInfo: MENUITEMINFO; var
MenuInfo: MENUITEMINFO;
MainMenuHandle: HMENU; MainMenuHandle: HMENU;
PopupMenu: TPopupMenu; PopupMenu: TPopupMenu;
MenuItemInfoSize: DWORD;
const
W95_MENUITEMINFO_SIZE = 44;
begin begin
Result:=nil; if (Win32MajorVersion = 4) and (Win32MinorVersion = 0) then
MenuInfo.cbSize:=sizeof(MENUITEMINFO); MenuItemInfoSize := W95_MENUITEMINFO_SIZE
MenuInfo.fMask:=MIIM_DATA; else
MenuItemInfoSize := sizeof(MENUITEMINFO);
Result := nil;
MenuInfo.cbSize := MenuItemInfoSize;
MenuInfo.fMask := MIIM_DATA;
{first we have to decide if the command is from a popup menu or from the window main menu} {first we have to decide if the command is from a popup menu or from the window main menu}
//if the 'PopupMenu' property exists, there is a big probability that the command is from a popup menu //if the 'PopupMenu' property exists, there is a big probability that the command is from a popup menu
PopupMenu := WindowInfo^.PopupMenu; PopupMenu := WindowInfo^.PopupMenu;