From a8faf01cf30ed3766c7d7fa066a4b2d22ad4ae4b Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@lazarus-ide.org>
Date: Tue, 20 Oct 2009 13:53:49 +0000
Subject: [PATCH] Activates menu support for wince-win32

git-svn-id: trunk@22245 -
---
 lcl/interfaces/wince/wincewinapi.inc | 7 +++++++
 lcl/interfaces/wince/wincewsmenus.pp | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lcl/interfaces/wince/wincewinapi.inc b/lcl/interfaces/wince/wincewinapi.inc
index 9bd14bce8f..1868bf3637 100644
--- a/lcl/interfaces/wince/wincewinapi.inc
+++ b/lcl/interfaces/wince/wincewinapi.inc
@@ -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}
 
 
 {------------------------------------------------------------------------------
diff --git a/lcl/interfaces/wince/wincewsmenus.pp b/lcl/interfaces/wince/wincewsmenus.pp
index a43cededc0..54d37620f8 100644
--- a/lcl/interfaces/wince/wincewsmenus.pp
+++ b/lcl/interfaces/wince/wincewsmenus.pp
@@ -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.