replace apple extended code

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

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 24f4846a87593aaaac94ef0987a98f1d5d9662dd..ca8af4aa8e39287bbb6751d70f10733184312863 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -47,7 +47,12 @@ extern wxMenu*                      wxCurrentPopupMenu;
 //
 // The (popup) menu title has this special id
 //
 //
 // The (popup) menu title has this special id
 //

-static const int                    idMenuTitle = -2;
+static const int                    idMenuTitle = -3;
+
+//
+// The unique ID for Menus
+//
+USHORT                              wxMenu::m_nextMenuId = 0;

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -56,44 +61,6 @@ static const int                    idMenuTitle = -2;
     IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 
     IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 

-// ----------------------------------------------------------------------------
-// static function for translating menu labels
-// ----------------------------------------------------------------------------
-
-static wxString TextToLabel(const wxString& rTitle)
-{
-    wxString Title;
-    const wxChar *pc;
-    for (pc = rTitle; *pc != wxT('\0'); pc++ )
-    {
-        if (*pc == wxT('&') )
-        {
-            if (*(pc+1) == wxT('&'))
-            {
-                pc++;
-                Title << wxT('&');
-            }
-            else 
-                Title << wxT('~');
-        }
-//         else if (*pc == wxT('/'))
-//         {
-//             Title << wxT('\\');
-//         }
-        else
-        {
-            if ( *pc == wxT('~') )
-            {
-                // tildes must be doubled to prevent them from being
-                // interpreted as accelerator character prefix by PM ???
-                Title << *pc;
-            }
-            Title << *pc;
-        }
-    }
-    return Title;
-}
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -108,12 +75,13 @@ 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)
     //
     if ((m_hMenu =  ::WinCreateWindow( HWND_DESKTOP
 
     //
     // Create the menu (to be used as a submenu or a popup)
     //
     if ((m_hMenu =  ::WinCreateWindow( HWND_DESKTOP

-                                      ,(const wxChar*)WC_MENU
+                                      ,WC_MENU

                                       ,"Menu"
                                       ,0L
                                       ,0L
                                       ,"Menu"
                                       ,0L
                                       ,0L


@@ -132,7 +100,7 @@ void wxMenu::Init()
     m_vMenuData.iPosition   = 0;
     m_vMenuData.afStyle     = MIS_SUBMENU | MIS_TEXT;
     m_vMenuData.afAttribute = (USHORT)0;
     m_vMenuData.iPosition   = 0;
     m_vMenuData.afStyle     = MIS_SUBMENU | MIS_TEXT;
     m_vMenuData.afAttribute = (USHORT)0;

-    m_vMenuData.id          = (USHORT)0;
+    m_vMenuData.id          = m_nextMenuId++;

     m_vMenuData.hwndSubMenu = m_hMenu;
     m_vMenuData.hItem       = NULLHANDLE;
 
     m_vMenuData.hwndSubMenu = m_hMenu;
     m_vMenuData.hItem       = NULLHANDLE;
 


@@ -143,6 +111,8 @@ void wxMenu::Init()
     {
         Append( idMenuTitle
                ,m_title
     {
         Append( idMenuTitle
                ,m_title

+               ,wxEmptyString
+               ,wxITEM_NORMAL

               );
         AppendSeparator();
     }
               );
         AppendSeparator();
     }


@@ -179,6 +149,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(


@@ -189,10 +167,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
 


@@ -200,45 +176,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 == (size_t)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())
+        {
+            GetMenuBar()->RebuildAccelTable();
+        }

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


@@ -252,105 +241,119 @@ 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;

-    MENUITEM                        vItem;

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

-    memset(&vItem, '\0', sizeof(vItem));
-

     //
     // If "Break" has just been called, insert a menu break before this item
     // (and don't forget to reset the flag)
     //
     if (m_bDoBreak)
     {
     //
     // If "Break" has just been called, insert a menu break before this item
     // (and don't forget to reset the flag)
     //
     if (m_bDoBreak)
     {

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

         m_bDoBreak = FALSE;
     }
 
         m_bDoBreak = FALSE;
     }
 

-    //
-    // Menu items that are being inserted into a submenu MUST have a
-    // MENUITEM structure separate from the parent menu so we must use
-    // a local vItem not the object's m_vMenuItem as that is the MENUITEM
-    // associated with the parent submenu.
-    //
-    if (pItem->IsSeparator())
-    {
-        vItem.afStyle |= MIS_SEPARATOR;
-    }
-

     //
     // Id is the numeric id for normal menu items and HMENU for submenus as
     // required by ::MM_INSERTITEM message API
     //
     //
     // Id is the numeric id for normal menu items and HMENU for submenus as
     // 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=NULL;

 
 #if wxUSE_OWNER_DRAWN
     if (pItem->IsOwnerDrawn())
     {
         //
         // Want to get {Measure|Draw}Item messages?
 
 #if wxUSE_OWNER_DRAWN
     if (pItem->IsOwnerDrawn())
     {
         //
         // 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
         //
         // Will eventually need to set the image handle somewhere into vItem.hItem
         //

-        vItem.afStyle |= MIS_OWNERDRAW;
-        pData = (BYTE*)pItem;
-        // vItem.hItem = ????
+        rItem.afStyle             |= MIS_OWNERDRAW;
+        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

+    if (pItem->IsSeparator())

     {
     {

-        //
-        // Menu is just a normal string (passed in data parameter)
-        //
-        vItem.afStyle |= MIS_TEXT;
-        pData = (char*)pItem->GetText().c_str();
+        rItem.afStyle = MIS_SEPARATOR;

     }
     }

-
-    APIRET                          rc;
-
-    if (pSubmenu == NULL)
+    else

     {
     {

-        //
-        // -1 means append at end
-        //
-        if (nPos == (size_t)-1)
+        if (pItem->GetId() == idMenuTitle)

         {
         {

-            vItem.iPosition = MIT_END;
+            // Item is an unselectable title to be passed via pData
+            rItem.afStyle = MIS_STATIC;

         }
         else
         {
         }
         else
         {

-            vItem.iPosition = nPos;
+            //
+            // Menu is just a normal string (passed in data parameter)
+            //
+            rItem.afStyle |= MIS_TEXT;

         }
         }

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

     }
 
     }
 

-    rc = (APIRET)::WinSendMsg(GetHmenu(), MM_INSERTITEM, (MPARAM)&vItem, (MPARAM)pData);
-    if (rc == MIT_MEMERROR || rc == MIT_ERROR)
+    if (nPos == (size_t)-1)
+    {
+        rItem.iPosition = MIT_END;
+    }
+    else
+    {
+        rItem.iPosition = nPos;
+    }
+
+    APIRET                          rc;
+
+    rc = (APIRET)::WinSendMsg( GetHmenu()
+                              ,MM_INSERTITEM
+                              ,(MPARAM)&rItem
+                              ,(MPARAM)pData
+                             );
+#if wxUSE_OWNER_DRAWN
+    if (pItem->IsOwnerDrawn())
+    {
+        MENUITEM                   vMenuItem;
+
+        ::WinSendMsg( GetHmenu()
+                     ,MM_QUERYITEM
+                     ,MPFROM2SHORT( (USHORT)pItem->GetId()
+                                   ,(USHORT)(FALSE)
+                                  )
+                     ,&vMenuItem
+                    );
+    }
+#endif
+    if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)

     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError);
+        wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError.c_str());

         wxLogLastError("Insert or AppendMenu");
         return FALSE;
     }
         wxLogLastError("Insert or AppendMenu");
         return FALSE;
     }


@@ -359,32 +362,104 @@ 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() && GetMenuBar()->IsAttached())

         {
         {

-            m_menuBar->Refresh();
+            GetMenuBar()->Refresh();

         }
         return TRUE;
     }
     return FALSE;
 } // end of wxMenu::DoInsertOrAppend
 
         }
         return TRUE;
     }
     return FALSE;
 } // end of wxMenu::DoInsertOrAppend
 

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

   wxMenuItem*                       pItem
 )
 {
   wxMenuItem*                       pItem
 )
 {

-    return wxMenuBase::DoAppend(pItem) && DoInsertOrAppend(pItem);
-}
+    wxCHECK_MSG( pItem, NULL, _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);

 
 

-bool wxMenu::DoInsert(
+            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 NULL;
+    }
+    if (bCheck)
+    {
+        //
+        // Check the item initially
+        //
+        pItem->Check(TRUE);
+    }
+    return pItem;
+} // end of wxMenu::DoAppend
+
+wxMenuItem* wxMenu::DoInsert(

   size_t                            nPos
 , wxMenuItem*                       pItem
 )
 {
   size_t                            nPos
 , wxMenuItem*                       pItem
 )
 {

-    return ( wxMenuBase::DoInsert( nPos
-                                  ,pItem) &&
+    if ( wxMenuBase::DoInsert( nPos
+                               ,pItem) &&

              DoInsertOrAppend( pItem
                               ,nPos
              DoInsertOrAppend( pItem
                               ,nPos

-                             ));
+                 ))
+         return pItem;
+    else
+        return NULL;

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


@@ -418,7 +493,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


@@ -430,12 +505,12 @@ wxMenuItem* wxMenu::DoRemove(
                  ,MPFROM2SHORT(pItem->GetId(), TRUE)
                  ,(MPARAM)0
                 );
                  ,MPFROM2SHORT(pItem->GetId(), TRUE)
                  ,(MPARAM)0
                 );

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

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

-        m_menuBar->Refresh();
+        GetMenuBar()->Refresh();

     }
 
     //
     }
 
     //


@@ -529,83 +604,72 @@ 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
+                                     ,MPFROMSHORT(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)
         return m_invokingWindow;
 wxWindow* wxMenu::GetWindow() const
 {
     if (m_invokingWindow != NULL)
         return m_invokingWindow;

-    else if ( m_menuBar != NULL)
-        return m_menuBar->GetFrame();
+    else if ( GetMenuBar() != NULL)
+        return GetMenuBar()->GetFrame();

 
     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
 // ---------------------------------------------------------------------------


@@ -613,7 +677,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
 


@@ -648,6 +712,15 @@ wxMenuBar::wxMenuBar(
 
 wxMenuBar::~wxMenuBar()
 {
 
 wxMenuBar::~wxMenuBar()
 {

+    //
+    // We should free PM's resources only if PM doesn't do it for us
+    // which happens if we're attached to a frame
+    //
+    if (m_hMenu && !IsAttached())
+    {
+        ::WinDestroyWindow((HMENU)m_hMenu);
+        m_hMenu = (WXHMENU)NULL;
+    }

 } // end of wxMenuBar::~wxMenuBar
 
 // ---------------------------------------------------------------------------
 } // end of wxMenuBar::~wxMenuBar
 
 // ---------------------------------------------------------------------------


@@ -658,14 +731,12 @@ 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()
 {

-    MENUITEM                        vItem;

     HWND                            hFrame;
     HWND                            hFrame;

-    HWND                            hMenuBar = NULLHANDLE;

 
     if (m_hMenu != 0 )
         return m_hMenu;
 
     if (m_hMenu != 0 )
         return m_hMenu;


@@ -675,74 +746,74 @@ 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;
     //
     // Create an empty menu and then fill it with insertions
     //
     else
         hFrame = HWND_DESKTOP;
     //
     // Create an empty menu and then fill it with insertions
     //

-    if (!wxWindow::OS2Create( hFrame
-                             ,WC_MENU
-                             ,"Menu"
-                             ,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE
-                             ,0L
-                             ,0L
-                             ,0L
-                             ,0L
-                             ,hFrame
-                             ,HWND_TOP
-                             ,FID_MENU
-                             ,(PVOID)NULL
-                             ,(PVOID)NULL
-                            ))
+    if ((m_hMenu =  ::WinCreateWindow( hFrame
+                                      ,WC_MENU
+                                      ,(PSZ)NULL
+                                      ,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE
+                                      ,0L
+                                      ,0L
+                                      ,0L
+                                      ,0L
+                                      ,hFrame
+                                      ,HWND_TOP
+                                      ,FID_MENU
+                                      ,NULL
+                                      ,NULL
+                                     )) == 0)

     {
     {

-        wxLogLastError("CreateMenu");
+        wxLogLastError("WinLoadMenu");

     }
     else
     {
         size_t                      nCount = GetMenuCount();
 
     }
     else
     {
         size_t                      nCount = GetMenuCount();
 

-        hMenuBar = GetHwnd();

         for (size_t i = 0; i < nCount; i++)
         {
             APIRET                  rc;
             ERRORID                 vError;
             wxString                sError;
         for (size_t i = 0; i < nCount; i++)
         {
             APIRET                  rc;
             ERRORID                 vError;
             wxString                sError;

-            MENUITEM                vItem;
+            HWND                    hSubMenu;

 
             //
             // Set the parent and owner of the submenues to be the menubar, not the desktop
             //
 
             //
             // Set the parent and owner of the submenues to be the menubar, not the desktop
             //

-            if (!::WinSetParent(m_menus[i]->m_vMenuData.hwndSubMenu, hMenuBar, FALSE))
+            hSubMenu = m_menus[i]->m_vMenuData.hwndSubMenu;
+            if (!::WinSetParent(m_menus[i]->m_vMenuData.hwndSubMenu, m_hMenu, FALSE))

             {
                 vError = ::WinGetLastError(vHabmain);
                 sError = wxPMErrorToStr(vError);
             {
                 vError = ::WinGetLastError(vHabmain);
                 sError = wxPMErrorToStr(vError);

-                wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+                wxLogError("Error setting parent for submenu. Error: %s\n", sError.c_str());

                 return NULLHANDLE;
             }
 
                 return NULLHANDLE;
             }
 

-            if (!::WinSetOwner(m_menus[i]->m_vMenuData.hwndSubMenu, hMenuBar))
+            if (!::WinSetOwner(m_menus[i]->m_vMenuData.hwndSubMenu, m_hMenu))

             {
                 vError = ::WinGetLastError(vHabmain);
                 sError = wxPMErrorToStr(vError);
             {
                 vError = ::WinGetLastError(vHabmain);
                 sError = wxPMErrorToStr(vError);

-                wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+                wxLogError("Error setting parent for submenu. Error: %s\n", sError.c_str());

                 return NULLHANDLE;
             }
 
             m_menus[i]->m_vMenuData.iPosition = i;
 
                 return NULLHANDLE;
             }
 
             m_menus[i]->m_vMenuData.iPosition = i;
 

-            rc = (APIRET)::WinSendMsg(hMenuBar, MM_INSERTITEM, (MPARAM)&m_menus[i]->m_vMenuData, (MPARAM)m_titles[i].c_str());
-            if (rc == MIT_MEMERROR || rc == MIT_ERROR)
+            rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&m_menus[i]->m_vMenuData, (MPARAM)m_titles[i].c_str());
+            if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)

             {
                 vError = ::WinGetLastError(vHabmain);
                 sError = wxPMErrorToStr(vError);
             {
                 vError = ::WinGetLastError(vHabmain);
                 sError = wxPMErrorToStr(vError);

-                wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError);
+                wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError.c_str());

                 return NULLHANDLE;
             }
         }
     }
                 return NULLHANDLE;
             }
         }
     }

-    return hMenuBar;
+    return m_hMenu;

 } // end of wxMenuBar::Create
 
 // ---------------------------------------------------------------------------
 } // end of wxMenuBar::Create
 
 // ---------------------------------------------------------------------------


@@ -771,7 +842,7 @@ void wxMenuBar::EnableTop(
         wxLogLastError("LogLastError");
         return;
     }
         wxLogLastError("LogLastError");
         return;
     }

-    ::WinSendMsg((HWND)m_hMenu, MM_SETITEMATTR, MPFROM2SHORT(nId, TRUE), MPFROM2SHORT(uFlag, uFlag));
+    ::WinSendMsg((HWND)m_hMenu, MM_SETITEMATTR, MPFROM2SHORT(nId, TRUE), MPFROM2SHORT(MIA_DISABLED, uFlag));

     Refresh();
 } // end of wxMenuBar::EnableTop
 
     Refresh();
 } // end of wxMenuBar::EnableTop
 


@@ -834,10 +905,10 @@ wxMenu* wxMenuBar::Replace(
 )
 {
     SHORT                            nId;
 )
 {
     SHORT                            nId;

-    wxString                         Title = TextToLabel(rTitle);
+    wxString                         sTitle = wxPMTextToLabel(rTitle);

     wxMenu*                          pMenuOld = wxMenuBarBase::Replace( nPos
                                                                        ,pMenu
     wxMenu*                          pMenuOld = wxMenuBarBase::Replace( nPos
                                                                        ,pMenu

-                                                                       ,Title
+                                                                       ,sTitle

                                                                       );
 
 
                                                                       );
 
 


@@ -848,12 +919,12 @@ wxMenu* wxMenuBar::Replace(
         return NULL;
     }
     if (!pMenuOld)
         return NULL;
     }
     if (!pMenuOld)

-        return FALSE;
-    m_titles[nPos] = Title;
+        return NULL;
+    m_titles[nPos] = sTitle;

     if (IsAttached())
     {
     if (IsAttached())
     {

-        ::WinSendMsg((HWND)m_hMenu, MM_DELETEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
-        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());
+        ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
+        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.c_str());

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


@@ -875,22 +946,26 @@ bool wxMenuBar::Insert(
 , const wxString&                   rTitle
 )
 {
 , const wxString&                   rTitle
 )
 {

-    wxString Title = TextToLabel(rTitle);
+    wxString                        sTitle = wxPMTextToLabel(rTitle);
+

     if (!wxMenuBarBase::Insert( nPos
                                ,pMenu
     if (!wxMenuBarBase::Insert( nPos
                                ,pMenu

-                               ,Title
+                               ,sTitle

                               ))
         return FALSE;
 
                               ))
         return FALSE;
 

-    m_titles.Insert( Title
+    m_titles.Insert( sTitle

                     ,nPos
                    );
 
                     ,nPos
                    );
 

-    pMenu->Attach(this);
-

     if (IsAttached())
     {
     if (IsAttached())
     {

-        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());
+        pMenu->m_vMenuData.iPosition = nPos;
+        ::WinSendMsg( (HWND)m_hMenu
+                     ,MM_INSERTITEM
+                     ,(MPARAM)&pMenu->m_vMenuData
+                     ,(MPARAM)sTitle.c_str()
+                    );

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


@@ -905,24 +980,24 @@ bool wxMenuBar::Insert(
 
 bool wxMenuBar::Append(
   wxMenu*                           pMenu
 
 bool wxMenuBar::Append(
   wxMenu*                           pMenu

-, const wxString&                   rTitle
+, const wxString&                   rsTitle

 )
 {
     WXHMENU                         hSubmenu = pMenu ? pMenu->GetHMenu() : 0;
 
     wxCHECK_MSG(hSubmenu, FALSE, wxT("can't append invalid menu to menubar"));
 
 )
 {
     WXHMENU                         hSubmenu = pMenu ? pMenu->GetHMenu() : 0;
 
     wxCHECK_MSG(hSubmenu, FALSE, wxT("can't append invalid menu to menubar"));
 

-    wxString Title = TextToLabel(rTitle);
-    if (!wxMenuBarBase::Append(pMenu, Title))
+    wxString                        sTitle = wxPMTextToLabel(rsTitle);
+
+    if (!wxMenuBarBase::Append(pMenu, sTitle))

         return FALSE;
 
         return FALSE;
 

-    pMenu->Attach(this);
-    m_titles.Add(Title);
+    m_titles.Add(sTitle);

 
     if ( IsAttached() )
     {
         pMenu->m_vMenuData.iPosition = MIT_END;
 
     if ( IsAttached() )
     {
         pMenu->m_vMenuData.iPosition = MIT_END;

-        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());
+        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.c_str());

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


@@ -947,7 +1022,11 @@ wxMenu* wxMenuBar::Remove(
     if (!pMenu)
         return NULL;
 
     if (!pMenu)
         return NULL;
 

-    nId = SHORT1FROMMR(::WinSendMsg((HWND)GetHmenu(), MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0));
+    nId = SHORT1FROMMR(::WinSendMsg( (HWND)GetHmenu()
+                                    ,MM_ITEMIDFROMPOSITION
+                                    ,MPFROMSHORT(nPos)
+                                    ,(MPARAM)0)
+                                   );

     if (nId == MIT_ERROR)
     {
         wxLogLastError("LogLastError");
     if (nId == MIT_ERROR)
     {
         wxLogLastError("LogLastError");


@@ -955,8 +1034,11 @@ wxMenu* wxMenuBar::Remove(
     }
     if (IsAttached())
     {
     }
     if (IsAttached())
     {

-        ::WinSendMsg((HWND)GetHmenu(), MM_DELETEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
-        pMenu->Detach();
+        ::WinSendMsg( (HWND)GetHmenu()
+                     ,MM_REMOVEITEM
+                     ,MPFROM2SHORT(nId, TRUE)
+                     ,(MPARAM)0
+                    );

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


@@ -1011,11 +1093,18 @@ 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();

+    //
+    // Ensure the accelerator table is set to the frame (not the client!)
+    //
+    if (!::WinSetAccelTable( vHabmain
+                            ,m_vAccelTable.GetHACCEL()
+                            ,(HWND)pFrame->GetFrame()
+                           ))
+        wxLogLastError("WinSetAccelTable");

 #endif // wxUSE_ACCEL
 } // end of wxMenuBar::Attach
 
 #endif // wxUSE_ACCEL
 } // end of wxMenuBar::Attach
 


@@ -1023,7 +1112,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
 
 // ---------------------------------------------------------------------------


@@ -1071,4 +1160,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