win32: formatting, cleanup

git-svn-id: trunk@29780 -
This commit is contained in:
paul 2011-03-10 06:35:10 +00:00
parent bbe53df988
commit 13cb137a99
2 changed files with 5 additions and 4 deletions

View File

@ -318,9 +318,10 @@ var
MenuInfo.fMask := MIIM_DATA; MenuInfo.fMask := MIIM_DATA;
MainMenuHandle := GetMenuParent(HMENU(WParam), GetMenu(Window)); MainMenuHandle := GetMenuParent(HMENU(WParam), GetMenu(Window));
if GetMenuItemInfo(MainMenuHandle, LOWORD(LParam), true, @MenuInfo) if GetMenuItemInfo(MainMenuHandle, LOWORD(LParam), true, @MenuInfo) then
then Result := TObject(MenuInfo.dwItemData) Result := TObject(MenuInfo.dwItemData)
else Result := nil; else
Result := nil;
end; end;
function GetMenuItemObject(ByPosition: Boolean): TObject; function GetMenuItemObject(ByPosition: Boolean): TObject;

View File

@ -1450,7 +1450,7 @@ const
); );
begin begin
MenuHandle := APopupMenu.Handle; MenuHandle := APopupMenu.Handle;
AppHandle := TWin32WidgetSet(WidgetSet).AppHandle; AppHandle := Win32WidgetSet.AppHandle;
GetWin32WindowInfo(AppHandle)^.PopupMenu := APopupMenu; GetWin32WindowInfo(AppHandle)^.PopupMenu := APopupMenu;
TrackPopupMenuEx(MenuHandle, TrackPopupMenuEx(MenuHandle,
lAlignment[APopupMenu.Alignment, APopupMenu.IsRightToLeft] or lTrackButtons[APopupMenu.TrackButton], lAlignment[APopupMenu.Alignment, APopupMenu.IsRightToLeft] or lTrackButtons[APopupMenu.TrackButton],