From b2c5f143fd7f9813735e977032d1102ef8606bc5 Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Wed, 14 Jan 2004 05:57:09 +0000
Subject: [PATCH] Added MSWPositionForWxMenu() method which is used to
 translate wxWindows menu positions to the ones that Windows is using.  This
 mainly accounts for the system menu in maximized MDI child frames.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/menu.h |  3 +++
 src/msw/menu.cpp      | 48 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 55d7d5c786..bc86e25417 100644
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -206,6 +206,9 @@ protected:
 
     WXHMENU       m_hMenu;
 
+    // Return the MSW position for a wxMenu which is sometimes different from
+    // the wxWindows position.
+    int MSWPositionForWxMenu(wxMenu *menu, int wxpos);
 #if wxUSE_ACCEL
     // the accelerator table for all accelerators in all our menus
     wxAcceleratorTable m_accelTable;
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index f8b1c4377b..4be9908fcc 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -824,6 +824,27 @@ WXHMENU wxMenuBar::Create()
 #endif
 }
 
+int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
+{
+    wxASSERT(menu);
+    wxASSERT(menu->GetHMenu());
+    wxASSERT(m_hMenu);
+    int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu);
+    int i; // For old C++ compatibility
+    for(i=wxpos; i<totalMSWItems; i++)
+    {
+        if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
+            return i;
+    }
+    for(i=0; i<wxpos; i++)
+    {
+        if(GetSubMenu((HMENU)m_hMenu,i)==(HMENU)menu->GetHMenu())
+            return i;
+    }
+    wxFAIL;
+    return -1;
+}
+
 // ---------------------------------------------------------------------------
 // wxMenuBar functions to work with the top level submenus
 // ---------------------------------------------------------------------------
@@ -834,10 +855,11 @@ WXHMENU wxMenuBar::Create()
 void wxMenuBar::EnableTop(size_t pos, bool enable)
 {
     wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
+    wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
 
     int flag = enable ? MF_ENABLED : MF_GRAYED;
 
-    EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag);
+    EnableMenuItem((HMENU)m_hMenu, MSWPositionForWxMenu(GetMenu(pos),pos), MF_BYPOSITION | flag);
 
     Refresh();
 }
@@ -854,8 +876,10 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
     }
     //else: have to modify the existing menu
 
+    int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
+
     UINT id;
-    UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION);
+    UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);
     if ( flagsOld == 0xFFFFFFFF )
     {
         wxLogLastError(wxT("GetMenuState"));
@@ -867,7 +891,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
     {
         // HIBYTE contains the number of items in the submenu in this case
         flagsOld &= 0xff;
-        id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos);
+        id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos);
     }
     else
     {
@@ -888,7 +912,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
     }
     
 #else
-    if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld,
+    if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,
         id, label) == (int)0xFFFFFFFF )
     {
         wxLogLastError(wxT("ModifyMenu"));
@@ -920,13 +944,15 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 
     if ( IsAttached() )
     {
+        int mswpos = MSWPositionForWxMenu(menuOld,pos);
+
         // can't use ModifyMenu() because it deletes the submenu it replaces
-        if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
+        if ( !::RemoveMenu(GetHmenu(), (UINT)mswpos, MF_BYPOSITION) )
         {
             wxLogLastError(wxT("RemoveMenu"));
         }
 
-        if ( !::InsertMenu(GetHmenu(), (UINT)pos,
+        if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
                            (UINT)GetHmenuOf(menu), title) )
         {
@@ -949,6 +975,12 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
+    // Find out which MSW item before which we'll be inserting before
+    // wxMenuBarBase::Insert is called and GetMenu(pos) is the new menu.
+    int mswpos = (pos == m_menus.GetCount())
+        ?   -1 // append the menu
+        :   MSWPositionForWxMenu(GetMenu(pos),pos);
+
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return FALSE;
 
@@ -977,7 +1009,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
             return FALSE;
         }
 #else
-        if ( !::InsertMenu(GetHmenu(), pos,
+        if ( !::InsertMenu(GetHmenu(), mswpos,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
                            (UINT)GetHmenuOf(menu), title) )
         {
@@ -1070,7 +1102,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
             }
         }
 #else
-        if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
+        if ( !::RemoveMenu(GetHmenu(), (UINT)MSWPositionForWxMenu(menu,pos), MF_BYPOSITION) )
         {
             wxLogLastError(wxT("RemoveMenu"));
         }