Allow for menus when deleting a tool

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index ce45117cf40ba03f216efab6bec83268ffbaa4d8..580e11d62694065381a7ca6ec347eba6ef2aa243 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -272,6 +272,10 @@ bool wxToolMenuBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
 
 bool wxToolMenuBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 {
+    // Skip over the menus
+    if (GetMenuBar())
+        pos += GetMenuBar()->GetMenuCount();
+        
     // the main difficulty we have here is with the controls in the toolbars:
     // as we (sometimes) use several separators to cover up the space used by
     // them, the indices are not the same for us and the toolbar