From 7a1ea2845e549909d197876c75c2cc82e5069b0e Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Fri, 6 Oct 2006 09:35:21 +0000 Subject: INTEGRATION: CWS onlineupdate4 (1.141.14); FILE MERGED 2006/10/04 07:40:33 dv 1.141.14.2: RESYNC: (1.141-1.142); FILE MERGED 2006/08/16 14:13:00 dv 1.141.14.1: #i68667# Use ItemPos instead of id to remove item --- vcl/source/window/menu.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vcl') diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 77204712c3fa..d63c0af3580e 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -4,9 +4,9 @@ * * $RCSfile: menu.cxx,v $ * - * $Revision: 1.142 $ + * $Revision: 1.143 $ * - * last change: $Author: obo $ $Date: 2006-09-17 12:19:43 $ + * last change: $Author: kz $ $Date: 2006-10-06 10:35:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -5661,7 +5661,8 @@ Rectangle MenuBarWindow::GetMenuBarButtonRectPixel( USHORT nId ) void MenuBarWindow::RemoveMenuBarButton( USHORT nId ) { - aCloser.RemoveItem( nId ); + USHORT nPos = aCloser.GetItemPos( nId ); + aCloser.RemoveItem( nPos ); m_aAddButtons.erase( nId ); aCloser.calcMinSize(); ImplLayoutChanged(); -- cgit