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

Activates menu support for wince-win32

Browse Source 
git-svn-id: trunk@22245 -
This commit is contained in:
sekelsenmat 2009-10-20 13:53:49 +00:00
parent 244afd1998
commit a8faf01cf3
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/interfaces/wince/wincewinapi.inc
View File

@ -2434,10 +2434,12 @@ begin
end;
function TWinCEWidgetSet.SetMenu(AWindowHandle: HWND; AMenuHandle: HMENU): Boolean;
{$ifndef Win32}
var
lLCLMenu: TMenu;
i: Integer;
begin
Result := False;
for i := 0 to WinCEWSMenus.MenuHandleList.Count - 1 do
if WinCEWSMenus.MenuHandleList.Items[i] = Pointer(AMenuHandle) then Break;
lLCLMenu := TMenu(MenuLCLObjectList.Items[i]);
@ -2446,6 +2448,11 @@ begin
AddToChangedMenus(AWindowHandle);
Result := True;
end;
{$else}
begin
Result := Windows.SetMenu(AWindowHandle, AMenuHandle);
end;
{$endif}
{------------------------------------------------------------------------------

8
lcl/interfaces/wince/wincewsmenus.pp
View File

@ -93,7 +93,9 @@ var
MenuHandleList, MenuLCLObjectList: TFPList;
function FindMenuItemAccelerator(const ACharCode: char; const AMenuHandle: HMENU): integer;
{$ifndef Win32}
procedure CeSetMenu(Wnd: HWND; Menu: HMENU; LCLMenu: TMenu);
{$endif}
implementation
@ -115,6 +117,7 @@ type
//menus
{$ifndef Win32}
//both menus are popup menus or submenus
procedure CeMakeMenuesSame(SrcMenu,dstMenu : HMENU);
var
@ -158,7 +161,6 @@ end;
associates a menu with a window.
}
procedure CeSetMenu(Wnd: HWND; Menu: HMENU; LCLMenu: TMenu);
{$ifndef Win32}
var
mbi: SHMENUBARINFO;
mi: MENUITEMINFO;
@ -170,9 +172,7 @@ var
LeftMenuCount: Integer = -1;
RightMenuCount: Integer = -1;
MenuBarRLID: integer;
{$endif}
begin
{$ifndef Win32}
GetWindowRect(Wnd, BR);
mbi.hwndMB:=SHFindMenuBar(Wnd);
// if (mbi.hwndMB <> 0) and (CePlatform = cpSmartphone) then begin
@ -376,8 +376,8 @@ begin
end;
//DrawMenuBar(wnd);
{$endif}
end;
{$endif}
(* Returns index of the character in the menu item caption that is displayed
as underlined and is therefore the hot key of the menu item.