A few tweaks and cleanups

[wxWidgets.git] / src / os2 / menu.cpp

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 78293daafaeb6fbdc4975edbbe5bddaabd039e72..5f4ba30bb47daf25c52bb280980860776790cde6 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -73,7 +73,7 @@ static wxString TextToLabel(const wxString& rTitle)
 {
     wxString Title;
     const wxChar *pc;
 {
     wxString Title;
     const wxChar *pc;

-    for (pc = rTitle; *pc != wxT('\0'); pc++ )
+    for (pc = rTitle.c_str(); *pc != wxT('\0'); pc++ )

     {
         if (*pc == wxT('&') )
         {
     {
         if (*pc == wxT('&') )
         {


@@ -85,10 +85,6 @@ static wxString TextToLabel(const wxString& rTitle)
             else
                 Title << wxT('~');
         }
             else
                 Title << wxT('~');
         }

-//         else if (*pc == wxT('/'))
-//         {
-//             Title << wxT('\\');
-//         }

         else
         {
             if ( *pc == wxT('~') )
         else
         {
             if ( *pc == wxT('~') )


@@ -117,6 +113,7 @@ static wxString TextToLabel(const wxString& rTitle)
 void wxMenu::Init()
 {
     m_bDoBreak = FALSE;
 void wxMenu::Init()
 {
     m_bDoBreak = FALSE;

+    m_nStartRadioGroup = -1;

 
     //
     // Create the menu (to be used as a submenu or a popup)
 
     //
     // Create the menu (to be used as a submenu or a popup)


@@ -178,9 +175,7 @@ wxMenu::~wxMenu()
     //
     // Delete accels
     //
     //
     // Delete accels
     //

-#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))

     WX_CLEAR_ARRAY(m_vAccels);
     WX_CLEAR_ARRAY(m_vAccels);

-#endif

 #endif // wxUSE_ACCEL
 } // end of wxMenu::~wxMenu
 
 #endif // wxUSE_ACCEL
 } // end of wxMenu::~wxMenu
 


@@ -190,6 +185,14 @@ void wxMenu::Break()
     m_bDoBreak = TRUE;
 } // end of wxMenu::Break
 
     m_bDoBreak = TRUE;
 } // end of wxMenu::Break
 

+void wxMenu::Attach(
+  wxMenuBarBase*                    pMenubar
+)
+{
+    wxMenuBase::Attach(pMenubar);
+    EndRadioGroup();
+} // end of wxMenu::Break;
+

 #if wxUSE_ACCEL
 
 int wxMenu::FindAccel(
 #if wxUSE_ACCEL
 
 int wxMenu::FindAccel(


@@ -200,10 +203,8 @@ int wxMenu::FindAccel(
     size_t                          nCount = m_vAccels.GetCount();
 
     for (n = 0; n < nCount; n++)
     size_t                          nCount = m_vAccels.GetCount();
 
     for (n = 0; n < nCount; n++)

-    {

         if (m_vAccels[n]->m_command == nId)
             return n;
         if (m_vAccels[n]->m_command == nId)
             return n;

-    }

     return wxNOT_FOUND;
 } // end of wxMenu::FindAccel
 
     return wxNOT_FOUND;
 } // end of wxMenu::FindAccel
 


@@ -211,45 +212,58 @@ void wxMenu::UpdateAccel(
   wxMenuItem*                       pItem
 )
 {
   wxMenuItem*                       pItem
 )
 {

-    //
-    // Find the (new) accel for this item
-    //
-    wxAcceleratorEntry*             pAccel = wxGetAccelFromString(pItem->GetText());
-
-    if (pAccel)
-        pAccel->m_command = pItem->GetId();
-
-    //
-    // Find the old one
-    //
-    int                             n = FindAccel(pItem->GetId());
+    if (pItem->IsSubMenu())
+    {
+        wxMenu*                     pSubmenu = pItem->GetSubMenu();
+        wxMenuItemList::Node*       pNode = pSubmenu->GetMenuItems().GetFirst();

 
 

-    if (n == wxNOT_FOUND)
+        while (pNode)
+        {
+            UpdateAccel(pNode->GetData());
+            pNode = pNode->GetNext();
+        }
+    }
+    else if (!pItem->IsSeparator())

     {
         //
     {
         //

-        // No old, add new if any
+        // Find the (new) accel for this item

         //
         //

+        wxAcceleratorEntry*         pAccel = wxGetAccelFromString(pItem->GetText());
+

         if (pAccel)
         if (pAccel)

-            m_vAccels.Add(pAccel);
-        else
-            return;     // skipping RebuildAccelTable() below
-    }
-    else
-    {
+            pAccel->m_command = pItem->GetId();
+

         //
         //

-        // Replace old with new or just remove the old one if no new
+        // Find the old one

         //
         //

-        delete                      m_vAccels[n];
+        size_t                      n = FindAccel(pItem->GetId());

 
 

-        if (pAccel)
-            m_vAccels[n] = pAccel;
+        if (n == wxNOT_FOUND)
+        {
+            //
+            // No old, add new if any
+            //
+            if (pAccel)
+                m_vAccels.Add(pAccel);
+            else
+                return;
+        }

         else
         else

-            m_vAccels.Remove(n);
-    }
+        {
+            //
+            // Replace old with new or just remove the old one if no new
+            //
+            delete m_vAccels[n];
+            if (pAccel)
+                m_vAccels[n] = pAccel;
+            else
+                m_vAccels.RemoveAt(n);
+        }

 
 

-    if (IsAttached())
-    {
-        m_menuBar->RebuildAccelTable();
+        if (IsAttached())
+        {
+            m_menuBar->RebuildAccelTable();
+        }

     }
 } // wxMenu::UpdateAccel
 
     }
 } // wxMenu::UpdateAccel
 


@@ -263,8 +277,13 @@ bool wxMenu::DoInsertOrAppend(
 , size_t                            nPos
 )
 {
 , size_t                            nPos
 )
 {

+    wxMenu*                         pSubmenu = pItem->GetSubMenu();
+    MENUITEM&                       rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
+                                            pItem->m_vMenuData;
+

     ERRORID                         vError;
     wxString                        sError;
     ERRORID                         vError;
     wxString                        sError;

+    char                            zMsg[128];

 #if wxUSE_ACCEL
     UpdateAccel(pItem);
 #endif // wxUSE_ACCEL
 #if wxUSE_ACCEL
     UpdateAccel(pItem);
 #endif // wxUSE_ACCEL


@@ -274,9 +293,6 @@ bool wxMenu::DoInsertOrAppend(
     // MENUITEM for submenus as required by ::MM_INSERTITEM message API
     //
 
     // MENUITEM for submenus as required by ::MM_INSERTITEM message API
     //
 

-    wxMenu*                         pSubmenu = pItem->GetSubMenu();
-    MENUITEM   &rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
-                                            pItem->m_vMenuData;

     if(pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
     if(pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));


@@ -296,7 +312,7 @@ bool wxMenu::DoInsertOrAppend(
 
     if (pItem->IsSeparator())
     {
 
     if (pItem->IsSeparator())
     {

-        vItem.afStyle |= MIS_SEPARATOR;
+        rItem.afStyle |= MIS_SEPARATOR;

     }
 
     //
     }
 
     //


@@ -304,20 +320,18 @@ bool wxMenu::DoInsertOrAppend(
     // required by ::MM_INSERTITEM message API
     //
 
     // required by ::MM_INSERTITEM message API
     //
 

-    wxMenu*                         pSubmenu = pItem->GetSubMenu();
-

     if (pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
         pSubmenu->SetParent(this);
 
     if (pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
         pSubmenu->SetParent(this);
 

-        vItem.iPosition = 0; // submenus have a 0 position
-        vItem.id = (USHORT)pSubmenu->GetHMenu();
-        vItem.afStyle |= MIS_SUBMENU | MIS_TEXT;
+        rItem.iPosition = 0; // submenus have a 0 position
+        rItem.id = (USHORT)pSubmenu->GetHMenu();
+        rItem.afStyle |= MIS_SUBMENU | MIS_TEXT;

     }
     else
     {
     }
     else
     {

-        vItem.id = pItem->GetId();
+        rItem.id = pItem->GetId();

     }
 
     BYTE*                           pData;
     }
 
     BYTE*                           pData;


@@ -327,12 +341,14 @@ bool wxMenu::DoInsertOrAppend(
     {
         //
         // Want to get {Measure|Draw}Item messages?
     {
         //
         // Want to get {Measure|Draw}Item messages?

-        // item draws itself, pass pointer to it in data parameter
+        // item draws itself, passing pointer to data doesn't work in OS/2

         // Will eventually need to set the image handle somewhere into vItem.hItem
         //
         rItem.afStyle |= MIS_OWNERDRAW;
         // Will eventually need to set the image handle somewhere into vItem.hItem
         //
         rItem.afStyle |= MIS_OWNERDRAW;

-        pData = (BYTE*)pItem;
-        // vItem.hItem = ????
+        pData = (BYTE*)NULL;
+        rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP();
+        pItem->m_vMenuData.afStyle = rItem.afStyle;
+        pItem->m_vMenuData.hItem = rItem.hItem;

     }
     else
 #endif
     }
     else
 #endif


@@ -340,7 +356,7 @@ bool wxMenu::DoInsertOrAppend(
         //
         // Menu is just a normal string (passed in data parameter)
         //
         //
         // Menu is just a normal string (passed in data parameter)
         //

-        vItem.afStyle |= MIS_TEXT;
+        rItem.afStyle |= MIS_TEXT;

         pData = (char*)pItem->GetText().c_str();
     }
 
         pData = (char*)pItem->GetText().c_str();
     }
 


@@ -360,6 +376,21 @@ bool wxMenu::DoInsertOrAppend(
                               ,(MPARAM)&rItem
                               ,(MPARAM)pData
                              );
                               ,(MPARAM)&rItem
                               ,(MPARAM)pData
                              );

+#if wxUSE_OWNER_DRAWN
+    if (pItem->IsOwnerDrawn())
+    {
+        BOOL                       rc;
+        MENUITEM                   vMenuItem;
+
+        ::WinSendMsg( GetHmenu()
+                     ,MM_QUERYITEM
+                     ,MPFROM2SHORT( (USHORT)pItem->GetId()
+                                   ,(USHORT)(FALSE)
+                                  )
+                     ,&vMenuItem
+                    );
+    }
+#endif

     if (rc == MIT_MEMERROR || rc == MIT_ERROR)
     {
         vError = ::WinGetLastError(vHabmain);
     if (rc == MIT_MEMERROR || rc == MIT_ERROR)
     {
         vError = ::WinGetLastError(vHabmain);


@@ -373,7 +404,7 @@ bool wxMenu::DoInsertOrAppend(
         //
         // If we're already attached to the menubar, we must update it
         //
         //
         // If we're already attached to the menubar, we must update it
         //

-        if (IsAttached())
+        if (IsAttached() && m_menuBar->IsAttached())

         {
             m_menuBar->Refresh();
         }
         {
             m_menuBar->Refresh();
         }


@@ -382,12 +413,81 @@ bool wxMenu::DoInsertOrAppend(
     return FALSE;
 } // end of wxMenu::DoInsertOrAppend
 
     return FALSE;
 } // end of wxMenu::DoInsertOrAppend
 

+void wxMenu::EndRadioGroup()
+{
+    //
+    // We're not inside a radio group any longer
+    //
+    m_nStartRadioGroup = -1;
+} // end of wxMenu::EndRadioGroup
+

 bool wxMenu::DoAppend(
   wxMenuItem*                       pItem
 )
 {
 bool wxMenu::DoAppend(
   wxMenuItem*                       pItem
 )
 {

-    return wxMenuBase::DoAppend(pItem) && DoInsertOrAppend(pItem);
-}
+    wxCHECK_MSG( pItem, FALSE, _T("NULL item in wxMenu::DoAppend") );
+
+    bool                            bCheck = FALSE;
+
+    if (pItem->GetKind() == wxITEM_RADIO)
+    {
+        int                         nCount = GetMenuItemCount();
+
+        if (m_nStartRadioGroup == -1)
+        {
+            //
+            // Start a new radio group
+            //
+            m_nStartRadioGroup = nCount;
+
+            //
+            // For now it has just one element
+            //
+            pItem->SetAsRadioGroupStart();
+            pItem->SetRadioGroupEnd(m_nStartRadioGroup);
+
+            //
+            // Ensure that we have a checked item in the radio group
+            //
+            bCheck = TRUE;
+        }
+        else // extend the current radio group
+        {
+            //
+            // We need to update its end item
+            //
+            pItem->SetRadioGroupStart(m_nStartRadioGroup);
+
+            wxMenuItemList::Node*   pNode = GetMenuItems().Item(m_nStartRadioGroup);
+
+            if (pNode)
+            {
+                pNode->GetData()->SetRadioGroupEnd(nCount);
+            }
+            else
+            {
+                wxFAIL_MSG( _T("where is the radio group start item?") );
+            }
+        }
+    }
+    else // not a radio item
+    {
+        EndRadioGroup();
+    }
+
+    if (!wxMenuBase::DoAppend(pItem) || !DoInsertOrAppend(pItem))
+    {
+        return FALSE;
+    }
+    if (bCheck)
+    {
+        //
+        // Check the item initially
+        //
+        pItem->Check(TRUE);
+    }
+    return TRUE;
+} // end of wxMenu::DoAppend

 
 bool wxMenu::DoInsert(
   size_t                            nPos
 
 bool wxMenu::DoInsert(
   size_t                            nPos


@@ -398,7 +498,8 @@ bool wxMenu::DoInsert(
                                   ,pItem) &&
              DoInsertOrAppend( pItem
                               ,nPos
                                   ,pItem) &&
              DoInsertOrAppend( pItem
                               ,nPos

-                             ));
+                             )
+           );

 } // end of wxMenu::DoInsert
 
 wxMenuItem* wxMenu::DoRemove(
 } // end of wxMenu::DoInsert
 
 wxMenuItem* wxMenu::DoRemove(


@@ -432,7 +533,7 @@ wxMenuItem* wxMenu::DoRemove(
     if (n != wxNOT_FOUND)
     {
         delete m_vAccels[n];
     if (n != wxNOT_FOUND)
     {
         delete m_vAccels[n];

-        m_vAccels.Remove(n);
+        m_vAccels.RemoveAt(n);

     }
 
 #endif // wxUSE_ACCEL
     }
 
 #endif // wxUSE_ACCEL


@@ -444,7 +545,7 @@ wxMenuItem* wxMenu::DoRemove(
                  ,MPFROM2SHORT(pItem->GetId(), TRUE)
                  ,(MPARAM)0
                 );
                  ,MPFROM2SHORT(pItem->GetId(), TRUE)
                  ,(MPARAM)0
                 );

-    if (IsAttached())
+    if (IsAttached() && m_menuBar->IsAttached())

     {
         //
         // Otherwise, the chane won't be visible
     {
         //
         // Otherwise, the chane won't be visible


@@ -543,73 +644,21 @@ bool wxMenu::OS2Command(
 
     if (vId != (WXWORD)idMenuTitle)
     {
 
     if (vId != (WXWORD)idMenuTitle)
     {

-        wxCommandEvent              vEvent(wxEVT_COMMAND_MENU_SELECTED);
-
-        vEvent.SetEventObject(this);
-        vEvent.SetId(vId);
-        vEvent.SetInt(vId);
-        ProcessCommand(vEvent);
+        SendEvent( vId
+                  ,(int)::WinSendMsg( GetHmenu()
+                                     ,MM_QUERYITEMATTR
+                                     ,(MPARAM)vId
+                                     ,(MPARAM)MIA_CHECKED
+                                    )
+                 );

     }
     return TRUE;
 } // end of wxMenu::OS2Command
 
     }
     return TRUE;
 } // end of wxMenu::OS2Command
 

-bool wxMenu::ProcessCommand(
-  wxCommandEvent&                   rEvent
-)
-{
-    bool                            bProcessed = FALSE;
-
-#if wxUSE_MENU_CALLBACK
-    //
-    // Try a callback
-    //
-    if (m_callback)
-    {
-        (void)(*(m_callback))(*this, rEvent);
-        bProcessed = TRUE;
-    }
-#endif // wxUSE_MENU_CALLBACK
-
-    //
-    // Try the menu's event handler
-    //
-    if (!bProcessed && GetEventHandler())
-    {
-        bProcessed = GetEventHandler()->ProcessEvent(rEvent);
-    }
-
-    //
-    // Try the window the menu was popped up from (and up through the
-    // hierarchy)
-    wxWindow*                       pWin = GetInvokingWindow();
-
-    if (!bProcessed && pWin)
-        bProcessed = pWin->GetEventHandler()->ProcessEvent(rEvent);
-    return bProcessed;
-} // end of wxMenu::ProcessCommand
-

 // ---------------------------------------------------------------------------
 // other
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // other
 // ---------------------------------------------------------------------------
 

-void wxMenu::Attach(
-  wxMenuBar*                        pMenubar
-)
-{
-    //
-    // Menu can be in at most one menubar because otherwise they would both
-    // delete the menu pointer
-    //
-    wxASSERT_MSG(!m_menuBar, wxT("menu belongs to 2 menubars, expect a crash"));
-    m_menuBar = pMenubar;
-} // end of
-
-void wxMenu::Detach()
-{
-    wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") );
-    m_menuBar = NULL;
-} // end of wxMenu::Detach
-

 wxWindow* wxMenu::GetWindow() const
 {
     if (m_invokingWindow != NULL)
 wxWindow* wxMenu::GetWindow() const
 {
     if (m_invokingWindow != NULL)


@@ -620,6 +669,47 @@ wxWindow* wxMenu::GetWindow() const
     return NULL;
 } // end of wxMenu::GetWindow
 
     return NULL;
 } // end of wxMenu::GetWindow
 

+// recursive search for item by id
+wxMenuItem* wxMenu::FindItem(
+  int                               nItemId
+, ULONG                             hItem
+, wxMenu**                          ppItemMenu
+) const
+{
+    if ( ppItemMenu )
+        *ppItemMenu = NULL;
+
+    wxMenuItem*                     pItem = NULL;
+
+    for ( wxMenuItemList::Node *node = m_items.GetFirst();
+          node && !pItem;
+          node = node->GetNext() )
+    {
+        pItem = node->GetData();
+
+        if ( pItem->GetId() == nItemId && pItem->m_vMenuData.hItem == hItem)
+        {
+            if ( ppItemMenu )
+                *ppItemMenu = (wxMenu *)this;
+        }
+        else if ( pItem->IsSubMenu() )
+        {
+            pItem = pItem->GetSubMenu()->FindItem( nItemId
+                                                  ,hItem
+                                                  ,ppItemMenu
+                                                 );
+            if (pItem)
+                break;
+        }
+        else
+        {
+            // don't exit the loop
+            pItem = NULL;
+        }
+    }
+    return pItem;
+} // end of wxMenu::FindItem
+

 // ---------------------------------------------------------------------------
 // Menu Bar
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Menu Bar
 // ---------------------------------------------------------------------------


@@ -627,7 +717,7 @@ wxWindow* wxMenu::GetWindow() const
 void wxMenuBar::Init()
 {
     m_eventHandler = this;
 void wxMenuBar::Init()
 {
     m_eventHandler = this;

-    m_pMenuBarFrame = NULL;
+    m_menuBarFrame = NULL;

     m_hMenu = 0;
 } // end of wxMenuBar::Init
 
     m_hMenu = 0;
 } // end of wxMenuBar::Init
 


@@ -672,7 +762,7 @@ void wxMenuBar::Refresh()
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
 
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
 

-    WinSendMsg(GetWinHwnd(m_pMenuBarFrame), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+    WinSendMsg(GetWinHwnd(m_menuBarFrame), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

 } // end of wxMenuBar::Refresh
 
 WXHMENU wxMenuBar::Create()
 } // end of wxMenuBar::Refresh
 
 WXHMENU wxMenuBar::Create()


@@ -688,8 +778,8 @@ WXHMENU wxMenuBar::Create()
     //
     // Menubars should be associated with a frame otherwise they are popups
     //
     //
     // Menubars should be associated with a frame otherwise they are popups
     //

-    if (m_pMenuBarFrame != NULL)
-        hFrame = GetWinHwnd(m_pMenuBarFrame);
+    if (m_menuBarFrame != NULL)
+        hFrame = GetWinHwnd(m_menuBarFrame);

     else
         hFrame = HWND_DESKTOP;
     //
     else
         hFrame = HWND_DESKTOP;
     //


@@ -899,8 +989,6 @@ bool wxMenuBar::Insert(
                     ,nPos
                    );
 
                     ,nPos
                    );
 

-    pMenu->Attach(this);
-

     if (IsAttached())
     {
         ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());
     if (IsAttached())
     {
         ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());


@@ -929,7 +1017,6 @@ bool wxMenuBar::Append(
     if (!wxMenuBarBase::Append(pMenu, Title))
         return FALSE;
 
     if (!wxMenuBarBase::Append(pMenu, Title))
         return FALSE;
 

-    pMenu->Attach(this);

     m_titles.Add(Title);
 
     if ( IsAttached() )
     m_titles.Add(Title);
 
     if ( IsAttached() )


@@ -969,7 +1056,6 @@ wxMenu* wxMenuBar::Remove(
     if (IsAttached())
     {
         ::WinSendMsg((HWND)GetHmenu(), MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
     if (IsAttached())
     {
         ::WinSendMsg((HWND)GetHmenu(), MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);

-        pMenu->Detach();

 
 #if wxUSE_ACCEL
         if (pMenu->HasAccels())
 
 #if wxUSE_ACCEL
         if (pMenu->HasAccels())


@@ -1024,8 +1110,7 @@ void wxMenuBar::Attach(
   wxFrame*                          pFrame
 )
 {
   wxFrame*                          pFrame
 )
 {

-    wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
-    m_pMenuBarFrame = pFrame;
+    wxMenuBarBase::Attach(pFrame);

 
 #if wxUSE_ACCEL
     RebuildAccelTable();
 
 #if wxUSE_ACCEL
     RebuildAccelTable();


@@ -1033,8 +1118,8 @@ void wxMenuBar::Attach(
     // Ensure the accelerator table is set to the frame (not the client!)
     //
     if (!::WinSetAccelTable( vHabmain
     // Ensure the accelerator table is set to the frame (not the client!)
     //
     if (!::WinSetAccelTable( vHabmain

-                            ,(HWND)pFrame->GetFrame()

                             ,m_vAccelTable.GetHACCEL()
                             ,m_vAccelTable.GetHACCEL()

+                            ,(HWND)pFrame->GetFrame()

                            ))
         wxLogLastError("WinSetAccelTable");
 #endif // wxUSE_ACCEL
                            ))
         wxLogLastError("WinSetAccelTable");
 #endif // wxUSE_ACCEL


@@ -1044,7 +1129,7 @@ void wxMenuBar::Detach()
 {
     ::WinDestroyWindow((HWND)m_hMenu);
     m_hMenu = (WXHMENU)NULL;
 {
     ::WinDestroyWindow((HWND)m_hMenu);
     m_hMenu = (WXHMENU)NULL;

-    m_pMenuBarFrame = NULL;
+    m_menuBarFrame = NULL;

 } // end of wxMenuBar::Detach
 
 // ---------------------------------------------------------------------------
 } // end of wxMenuBar::Detach
 
 // ---------------------------------------------------------------------------


@@ -1092,4 +1177,25 @@ wxMenuItem* wxMenuBar::FindItem(
     return pItem;
 } // end of wxMenuBar::FindItem
 
     return pItem;
 } // end of wxMenuBar::FindItem
 

+wxMenuItem* wxMenuBar::FindItem(
+  int                               nId
+, ULONG                             hItem
+, wxMenu**                          ppItemMenu
+) const
+{
+    if (ppItemMenu)
+        *ppItemMenu = NULL;
+
+    wxMenuItem*                     pItem = NULL;
+    size_t                          nCount = GetMenuCount();
+
+    for (size_t i = 0; !pItem && (i < nCount); i++)
+    {
+        pItem = m_menus[i]->FindItem( nId
+                                     ,hItem
+                                     ,ppItemMenu
+                                    );
+    }
+    return pItem;
+} // end of wxMenuBar::FindItem