Index: lcl/include/menuitem.inc
===================================================================
--- lcl/include/menuitem.inc	(revision 40800)
+++ lcl/include/menuitem.inc	(working copy)
@@ -107,7 +107,7 @@
   FChecked := False;
   FVisible := True;
   FEnabled := True;
-  FCommand := UniqueCommand;
+  FCommand := TWSMenuItemClass(WidgetSetClass).OpenCommand;
   FImageIndex := -1;
   FBitmapIsValid := True;
   FRightJustify := False;
@@ -206,7 +206,7 @@
     FreeAndNil(FMenuItemHandlers[HandlerType]);
   if FParent <> nil then
     FParent.FItems.Remove(Self);
-  if FCommand <> 0 then CommandPool[FCommand] := False;
+  if FCommand <> 0 then TWSMenuItemClass(WidgetSetClass).CloseCommand(FCommand);
   //debugln('TMenuItem.Destroy B ',dbgsName(Self));
   inherited Destroy;
 end;
Index: lcl/interfaces/wince/wincewsmenus.pp
===================================================================
--- lcl/interfaces/wince/wincewsmenus.pp	(revision 40800)
+++ lcl/interfaces/wince/wincewsmenus.pp	(working copy)
@@ -51,6 +51,8 @@
       var AForm: TForm): Boolean;
     {$endif}
   published
+    class function OpenCommand: LongInt; override;
+    class procedure CloseCommand(ACommand: LongInt); override;
     class procedure AttachMenu(const AMenuItem: TMenuItem); override;
     class function CreateHandle(const AMenuItem: TMenuItem): HMENU; override;
     class procedure DestroyHandle(const AMenuItem: TMenuItem); override;
@@ -86,7 +88,7 @@
   end;
 
 const
-  // IDs corresponding to the file winceres.rc
+  // IDs corresponding to the file wincemenures.rc
   MenuBarID_Items  = 20000;
   MenuBarID_PopUp_Item = 20001;
   MenuBarID_Item_Popup = 20002;
@@ -96,6 +98,7 @@
   MenuBarID_Empty = 20006;
   MenuBarID_L = 1001;
   MenuBarID_R = 1002;
+  MenuBarID_BASE = 1003;
 var
   MenuItemsList: TStringList;
   MenuHandleList, MenuLCLObjectList: TFPList;
@@ -579,7 +582,6 @@
   begin
     GetWindowRect(mbi.hwndMB, R);
     Windows.SystemParametersInfo(SPI_GETWORKAREA, 0, @WR, 0);
-
     if WR.Bottom > R.Top then
       SetWindowPos(wnd, 0, 0, 0, WR.Right - WR.Left, R.Top - WR.Top, SWP_NOZORDER or SWP_NOREPOSITION or SWP_NOMOVE);
   end;
@@ -893,6 +895,19 @@
       Break;
     end;
 end;
+
+class function TWinCEWSMenuItem.OpenCommand: LongInt;
+begin
+  Result := inherited OpenCommand;
+  Result := Result + MenuBarID_BASE;
+end;
+
+class procedure TWinCEWSMenuItem.CloseCommand(ACommand: LongInt);
+begin
+  ACommand := ACommand - MenuBarID_BASE;
+  inherited CloseCommand(ACommand);
+end;
+
 {$endif}
 
 class procedure TWinCEWSMenuItem.AttachMenu(const AMenuItem: TMenuItem);
Index: lcl/menus.pp
===================================================================
--- lcl/menus.pp	(revision 40800)
+++ lcl/menus.pp	(working copy)
@@ -457,19 +457,6 @@
   WSMenus,
   Forms {KeyDataToShiftState};
 
-{ Menu command management }
-
-var
-  CommandPool: TBits = nil;
-
-function UniqueCommand: LongInt;
-begin
-  if CommandPool = nil then
-    CommandPool := TBits.Create(16);
-  Result := CommandPool.OpenBit;
-  CommandPool[Result] := True;
-end;
-
 { Easy Menu building }
 
 procedure AddMenuItems(AMenu: TMenu; const Items: array of TMenuItem);
@@ -596,7 +583,4 @@
   Result := FPosition < FMenuItem.Count;
 end;
 
-finalization
-  FreeThenNil(CommandPool);
-
 end.
Index: lcl/widgetset/wsmenus.pp
===================================================================
--- lcl/widgetset/wsmenus.pp	(revision 40800)
+++ lcl/widgetset/wsmenus.pp	(working copy)
@@ -55,6 +55,8 @@
 
   TWSMenuItem = class(TWSLCLComponent)
   published
+    class function  OpenCommand: LongInt; virtual;
+    class procedure CloseCommand(ACommand: LongInt); virtual;
     class procedure AttachMenu(const AMenuItem: TMenuItem); virtual;
     class function  CreateHandle(const AMenuItem: TMenuItem): HMENU; virtual;
     class procedure DestroyHandle(const AMenuItem: TMenuItem); virtual;
@@ -105,8 +107,31 @@
 
 implementation
 
+{ Menu command management }
+
+var
+  CommandPool: TBits = nil;
+
+function UniqueCommand: LongInt;
+begin
+  if CommandPool = nil then
+    CommandPool := TBits.Create(16);
+  Result := CommandPool.OpenBit;
+  CommandPool[Result] := True;
+end;
+
 { TWSMenuItem }
 
+class function TWSMenuItem.OpenCommand: LongInt;
+begin
+  Result := UniqueCommand;
+end;
+
+class procedure TWSMenuItem.CloseCommand(ACommand: LongInt);
+begin
+  CommandPool[ACommand] := False;
+end;
+
 class procedure TWSMenuItem.AttachMenu(const AMenuItem: TMenuItem);
 begin
 end;
@@ -238,4 +263,6 @@
   Done := True;
 end;
 
+finalization
+  FreeThenNil(CommandPool);
 end.