]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/menu.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix minor typo in wxDV_VERT_RULES documentation.
[wxWidgets.git] / src / os2 / menu.cpp
diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 442525a8f6c3f1849fc684b282b6d2cfc1f9458f..73b5a56cfaa36e8b1e556a2dc38c252bfb731464 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        menu.cpp
+// Name:        src/os2/menu.cpp
 // Purpose:     wxMenu, wxMenuBar, wxMenuItem
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxMenu, wxMenuBar, wxMenuItem
 // Author:      David Webster
 // Modified by:
@@ -9,16 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "menu.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/menu.h"
+
 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/frame.h"
-    #include "wx/menu.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
@@ -37,22 +35,26 @@
 // global variables
 // ----------------------------------------------------------------------------
 
 // global variables
 // ----------------------------------------------------------------------------
 
-extern wxMenu *wxCurrentPopupMenu;
+extern wxMenu*                      wxCurrentPopupMenu;
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
-// the (popup) menu title has this special id
-static const int idMenuTitle = -2;
+//
+// The (popup) menu title has this special id
+//
+static const int                    idMenuTitle = -3;
+
+//
+// The unique ID for Menus
+//
+USHORT                              wxMenu::m_nextMenuId = 0;
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
-    IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-
 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================
@@ -61,258 +63,462 @@ static const int idMenuTitle = -2;
 // wxMenu construction, adding and removing menu items
 // ---------------------------------------------------------------------------
 
 // wxMenu construction, adding and removing menu items
 // ---------------------------------------------------------------------------
 
+//
 // Construct a menu with optional title (then use append)
 // Construct a menu with optional title (then use append)
+//
 void wxMenu::Init()
 {
 void wxMenu::Init()
 {
-    m_doBreak = FALSE;
-
-    // create the menu
-    m_hMenu = (WXHMENU)0; // CreatePopupMenu();
-    if ( !m_hMenu )
+    m_bDoBreak = false;
+    m_nStartRadioGroup = -1;
+
+    //
+    // Create the menu (to be used as a submenu or a popup)
+    //
+    if ((m_hMenu =  ::WinCreateWindow( HWND_DESKTOP
+                                      ,WC_MENU
+                                      ,"Menu"
+                                      ,0L
+                                      ,0L
+                                      ,0L
+                                      ,0L
+                                      ,0L
+                                      ,NULLHANDLE
+                                      ,HWND_TOP
+                                      ,0L
+                                      ,NULL
+                                      ,NULL
+                                     )) == 0)
     {
     {
-        wxLogLastError("CreatePopupMenu");
+        wxLogLastError(wxT("WinLoadMenu"));
     }
     }
-
-    // if we have a title, insert it in the beginning of the menu
-    if ( !!m_title )
+    m_vMenuData.iPosition   = 0;
+    m_vMenuData.afStyle     = MIS_SUBMENU | MIS_TEXT;
+    m_vMenuData.afAttribute = (USHORT)0;
+    m_vMenuData.id          = m_nextMenuId++;
+    m_vMenuData.hwndSubMenu = m_hMenu;
+    m_vMenuData.hItem       = NULLHANDLE;
+
+    //
+    // If we have a title, insert it in the beginning of the menu
+    //
+    if (!m_title.empty())
     {
     {
-        Append(idMenuTitle, m_title);
+        Append( idMenuTitle
+               ,m_title
+               ,wxEmptyString
+               ,wxITEM_NORMAL
+              );
         AppendSeparator();
     }
         AppendSeparator();
     }
-}
+} // end of wxMenu::Init
 
 
+//
 // The wxWindow destructor will take care of deleting the submenus.
 // The wxWindow destructor will take care of deleting the submenus.
+//
 wxMenu::~wxMenu()
 {
 wxMenu::~wxMenu()
 {
-    // we should free Windows resources only if Windows doesn't do it for us
+    //
+    // We should free PM resources only if PM doesn't do it for us
     // which happens if we're attached to a menubar or a submenu of another
     // menu
     // which happens if we're attached to a menubar or a submenu of another
     // menu
-    if ( !IsAttached() && !GetParent() )
+    if (!IsAttached() && !GetParent())
     {
     {
-/*
-        if ( !::DestroyMenu(GetHmenu()) )
+        if (!::WinDestroyWindow((HWND)GetHmenu()) )
         {
         {
-            wxLogLastError("DestroyMenu");
+            wxLogLastError(wxT("WinDestroyWindow"));
         }
         }
-*/
     }
 
 #if wxUSE_ACCEL
     }
 
 #if wxUSE_ACCEL
-    // delete accels
-    WX_CLEAR_ARRAY(m_accels);
+    //
+    // Delete accels
+    //
+    WX_CLEAR_ARRAY(m_vAccels);
 #endif // wxUSE_ACCEL
 #endif // wxUSE_ACCEL
-}
+} // end of wxMenu::~wxMenu
 
 void wxMenu::Break()
 {
     // this will take effect during the next call to Append()
 
 void wxMenu::Break()
 {
     // this will take effect during the next call to Append()
-    m_doBreak = TRUE;
-}
+    m_bDoBreak = true;
+} // end of wxMenu::Break
+
+void wxMenu::Attach(
+  wxMenuBarBase*                    pMenubar
+)
+{
+    wxMenuBase::Attach(pMenubar);
+    EndRadioGroup();
+} // end of wxMenu::Break;
 
 #if wxUSE_ACCEL
 
 
 #if wxUSE_ACCEL
 
-int wxMenu::FindAccel(int id) const
+int wxMenu::FindAccel(
+  int                               nId
+) const
 {
 {
-    size_t n, count = m_accels.GetCount();
-    for ( n = 0; n < count; n++ )
-    {
-        if ( m_accels[n]->m_command == id )
-            return n;
-    }
+    size_t                          n;
+    size_t                          nCount = m_vAccels.GetCount();
 
 
+    for (n = 0; n < nCount; n++)
+        if (m_vAccels[n]->m_command == nId)
+            return n;
     return wxNOT_FOUND;
     return wxNOT_FOUND;
-}
+} // end of wxMenu::FindAccel
 
 
-void wxMenu::UpdateAccel(wxMenuItem *item)
+void wxMenu::UpdateAccel(
+  wxMenuItem*                       pItem
+)
 {
 {
-    // find the (new) accel for this item
-    wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText());
-    if ( accel )
-        accel->m_command = item->GetId();
-
-    // find the old one
-    int n = FindAccel(item->GetId());
-    if ( n == wxNOT_FOUND )
+    if (pItem->IsSubMenu())
     {
     {
-        // no old, add new if any
-        if ( accel )
-            m_accels.Add(accel);
-        else
-            return;     // skipping RebuildAccelTable() below
+        wxMenu*                     pSubmenu = pItem->GetSubMenu();
+        wxMenuItemList::compatibility_iterator node = pSubmenu->GetMenuItems().GetFirst();
+
+        while (node)
+        {
+            UpdateAccel(node->GetData());
+            node = node->GetNext();
+        }
     }
     }
-    else
+    else if (!pItem->IsSeparator())
     {
     {
-        // replace old with new or just remove the old one if no new
-        delete m_accels[n];
-        if ( accel )
-            m_accels[n] = accel;
+        //
+        // Recurse upwards: we should only modify m_accels of the top level
+        // menus, not of the submenus as wxMenuBar doesn't look at them
+        // (alternative and arguable cleaner solution would be to recurse
+        // downwards in GetAccelCount() and CopyAccels())
+        //
+        if (GetParent())
+        {
+            GetParent()->UpdateAccel(pItem);
+            return;
+        }
+
+        //
+        // Find the (new) accel for this item
+        //
+        wxAcceleratorEntry*         pAccel = wxAcceleratorEntry::Create(pItem->GetItemLabel());
+
+        if (pAccel)
+            pAccel->m_command = pItem->GetId();
+
+        //
+        // Find the old one
+        //
+        size_t                      n = FindAccel(pItem->GetId());
+
+        if (n == (size_t)wxNOT_FOUND)
+        {
+            //
+            // No old, add new if any
+            //
+            if (pAccel)
+                m_vAccels.Add(pAccel);
+            else
+                return;
+        }
         else
         else
-            m_accels.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
 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 
-// append a new item or submenu to the menu
-bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
+//
+// Append a new item or submenu to the menu
+//
+bool wxMenu::DoInsertOrAppend( wxMenuItem* pItem,
+                               size_t      nPos )
 {
 {
+    wxMenu*    pSubmenu = pItem->GetSubMenu();
+    MENUITEM&  rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
+                       pItem->m_vMenuData;
+
+    ERRORID    vError;
+    wxString   sError;
+
 #if wxUSE_ACCEL
     UpdateAccel(pItem);
 #endif // wxUSE_ACCEL
 
 #if wxUSE_ACCEL
     UpdateAccel(pItem);
 #endif // wxUSE_ACCEL
 
-    UINT flags = 0;
-// TODO:
-/*
-    // if "Break" has just been called, insert a menu break before this item
+    //
+    // If "Break" has just been called, insert a menu break before this item
     // (and don't forget to reset the flag)
     // (and don't forget to reset the flag)
-    if ( m_doBreak ) {
-        flags |= MF_MENUBREAK;
-        m_doBreak = FALSE;
-    }
-
-    if ( pItem->IsSeparator() ) {
-        flags |= MF_SEPARATOR;
+    //
+    if (m_bDoBreak)
+    {
+        rItem.afStyle |= MIS_BREAK;
+        m_bDoBreak = false;
     }
 
     }
 
-    // id is the numeric id for normal menu items and HMENU for submenus as
-    // required by ::AppendMenu() API
-    UINT id;
-    wxMenu *submenu = pItem->GetSubMenu();
-    if ( submenu != NULL ) {
-        wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") );
-
-        submenu->SetParent(this);
-
-        id = (UINT)submenu->GetHMenu();
+    //
+    // Id is the numeric id for normal menu items and HMENU for submenus as
+    // required by ::MM_INSERTITEM message API
+    //
+    if (pSubmenu != NULL)
+    {
+        wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
+        pSubmenu->SetParent(this);
 
 
-        flags |= MF_POPUP;
+        rItem.iPosition = 0; // submenus have a 0 position
+        rItem.id        = (USHORT)pSubmenu->GetHMenu();
+        rItem.afStyle  |= MIS_SUBMENU | MIS_TEXT;
     }
     }
-    else {
-        id = pItem->GetId();
+    else
+    {
+        rItem.id = (USHORT)pItem->GetId();
     }
 
     }
 
-    LPCTSTR pData;
+    char *pData = NULL;
 
 #if wxUSE_OWNER_DRAWN
 
 #if wxUSE_OWNER_DRAWN
-    if ( pItem->IsOwnerDrawn() ) {  // want to get {Measure|Draw}Item messages?
-        // item draws itself, pass pointer to it in data parameter
-        flags |= MF_OWNERDRAW;
-        pData = (LPCTSTR)pItem;
+    if (pItem->IsOwnerDrawn())
+    {
+        //
+        // Want to get {Measure|Draw}Item messages?
+        // 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;
+        pData                      = 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)
-        flags |= MF_STRING;
-
-        pData = (char*)pItem->GetText().c_str();
+        rItem.afStyle = MIS_SEPARATOR;
+    }
+    else
+    {
+        if (pItem->GetId() == idMenuTitle)
+        {
+            // Item is an unselectable title to be passed via pData
+            rItem.afStyle = MIS_STATIC;
+        }
+        else
+        {
+            //
+            // Menu is just a normal string (passed in data parameter)
+            //
+            rItem.afStyle |= MIS_TEXT;
+        }
+        pData = (char*) pItem->GetItemLabel().wx_str();
     }
 
     }
 
-    BOOL ok;
-    if ( pos == (size_t)-1 )
+    if (nPos == (size_t)-1)
     {
     {
-        ok = ::AppendMenu(GetHmenu(), flags, id, pData);
+        rItem.iPosition = MIT_END;
     }
     else
     {
     }
     else
     {
-        ok = ::InsertMenu(GetHmenu(), pos, flags | MF_BYPOSITION, id, pData);
+        rItem.iPosition = (SHORT)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 ( !ok )
+    if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
     {
     {
-        wxLogLastError("Insert or AppendMenu");
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError(wxT("Error inserting or appending a menuitem. Error: %s\n"), sError.c_str());
+        wxLogLastError(wxT("Insert or AppendMenu"));
+        return false;
+    }
 
 
-        return FALSE;
+    //
+    // If we're already attached to the menubar, we must update it
+    //
+    if (IsAttached() && GetMenuBar()->IsAttached())
+    {
+        GetMenuBar()->Refresh();
     }
     }
-    else
+
+    return true;
+} // end of wxMenu::DoInsertOrAppend
+
+void wxMenu::EndRadioGroup()
+{
+    //
+    // We're not inside a radio group any longer
+    //
+    m_nStartRadioGroup = -1;
+} // end of wxMenu::EndRadioGroup
+
+wxMenuItem* wxMenu::DoAppend( wxMenuItem* pItem )
+{
+    wxCHECK_MSG( pItem, NULL, wxT("NULL item in wxMenu::DoAppend") );
+
+    bool bCheck = false;
+
+    if (pItem->GetKind() == wxITEM_RADIO)
     {
     {
-        // if we just appended the title, highlight it
-#ifdef __WIN32__
-        if ( (int)id == idMenuTitle )
+        int                         nCount = GetMenuItemCount();
+
+        if (m_nStartRadioGroup == -1)
         {
         {
-            // visually select the menu title
-            MENUITEMINFO mii;
-            mii.cbSize = sizeof(mii);
-            mii.fMask = MIIM_STATE;
-            mii.fState = MFS_DEFAULT;
+            //
+            // 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);
 
 
-            if ( !SetMenuItemInfo(GetHmenu(), (unsigned)id, FALSE, &mii) )
+            wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_nStartRadioGroup);
+
+            if (node)
             {
             {
-                wxLogLastError(wxT("SetMenuItemInfo"));
+                node->GetData()->SetRadioGroupEnd(nCount);
+            }
+            else
+            {
+                wxFAIL_MSG( wxT("where is the radio group start item?") );
             }
         }
             }
         }
-#endif // __WIN32__
-
-        // if we're already attached to the menubar, we must update it
-        if ( IsAttached() )
-        {
-            m_menuBar->Refresh();
-        }
+    }
+    else // not a radio item
+    {
+        EndRadioGroup();
+    }
 
 
-        return TRUE;
+    if (!wxMenuBase::DoAppend(pItem) || !DoInsertOrAppend(pItem))
+    {
+        return NULL;
+    }
+    if (bCheck)
+    {
+        //
+        // Check the item initially
+        //
+        pItem->Check(true);
     }
     }
-*/
-    return FALSE;
-}
+    return pItem;
+} // end of wxMenu::DoAppend
 
 
-bool wxMenu::DoAppend(wxMenuItem *item)
+wxMenuItem* wxMenu::DoInsert(
+  size_t                            nPos
+, wxMenuItem*                       pItem
+)
 {
 {
-    return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item);
-}
+    if ( wxMenuBase::DoInsert( nPos
+                               ,pItem) &&
+             DoInsertOrAppend( pItem
+                              ,nPos
+                 ))
+         return pItem;
+    else
+        return NULL;
+} // end of wxMenu::DoInsert
 
 
-bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenu::DoRemove(
+  wxMenuItem*                       pItem
+)
 {
 {
-    return wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos);
-}
+    //
+    // We need to find the items position in the child list
+    //
+    size_t                          nPos;
+    wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
 
 
-wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
-{
-    // we need to find the items position in the child list
-    size_t pos;
-    wxMenuItemList::Node *node = GetMenuItems().GetFirst();
-    for ( pos = 0; node; pos++ )
+    for (nPos = 0; node; nPos++)
     {
     {
-        if ( node->GetData() == item )
+        if (node->GetData() == pItem)
             break;
             break;
-
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 
+    //
     // DoRemove() (unlike Remove) can only be called for existing item!
     // DoRemove() (unlike Remove) can only be called for existing item!
-    wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
+    //
+    wxCHECK_MSG(node, NULL, wxT("bug in wxMenu::Remove logic"));
 
 #if wxUSE_ACCEL
 
 #if wxUSE_ACCEL
-    // remove the corresponding accel from the accel table
-    int n = FindAccel(item->GetId());
-    if ( n != wxNOT_FOUND )
-    {
-        delete m_accels[n];
+    //
+    // Remove the corresponding accel from the accel table
+    //
+    int                             n = FindAccel(pItem->GetId());
 
 
-        m_accels.Remove(n);
-    }
-    //else: this item doesn't have an accel, nothing to do
-#endif // wxUSE_ACCEL
-/*
-    // remove the item from the menu
-    if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
+    if (n != wxNOT_FOUND)
     {
     {
-        wxLogLastError("RemoveMenu");
+        delete m_vAccels[n];
+        m_vAccels.RemoveAt(n);
     }
     }
-*/
-    if ( IsAttached() )
+
+#endif // wxUSE_ACCEL
+    //
+    // Remove the item from the menu
+    //
+    ::WinSendMsg( GetHmenu()
+                 ,MM_REMOVEITEM
+                 ,MPFROM2SHORT(pItem->GetId(), TRUE)
+                 ,(MPARAM)0
+                );
+    if (IsAttached() && GetMenuBar()->IsAttached())
     {
     {
-        // otherwise, the chane won't be visible
-        m_menuBar->Refresh();
+        //
+        // Otherwise, the chane won't be visible
+        //
+        GetMenuBar()->Refresh();
     }
 
     }
 
-    // and from internal data structures
-    return wxMenuBase::DoRemove(item);
-}
+    //
+    // And from internal data structures
+    //
+    return wxMenuBase::DoRemove(pItem);
+} // end of wxMenu::DoRemove
 
 // ---------------------------------------------------------------------------
 // accelerator helpers
 
 // ---------------------------------------------------------------------------
 // accelerator helpers
@@ -320,18 +526,22 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 
 #if wxUSE_ACCEL
 
 
 #if wxUSE_ACCEL
 
-// create the wxAcceleratorEntries for our accels and put them into provided
+//
+// Create the wxAcceleratorEntries for our accels and put them into provided
 // array - return the number of accels we have
 // array - return the number of accels we have
-size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const
+//
+size_t wxMenu::CopyAccels(
+  wxAcceleratorEntry*               pAccels
+) const
 {
 {
-    size_t count = GetAccelCount();
-    for ( size_t n = 0; n < count; n++ )
+    size_t                          nCount = GetAccelCount();
+
+    for (size_t n = 0; n < nCount; n++)
     {
     {
-        *accels++ = *m_accels[n];
+        *pAccels++ = *m_vAccels[n];
     }
     }
-
-    return count;
-}
+    return nCount;
+} // end of wxMenu::CopyAccels
 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 
@@ -339,150 +549,123 @@ size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const
 // set wxMenu title
 // ---------------------------------------------------------------------------
 
 // set wxMenu title
 // ---------------------------------------------------------------------------
 
-void wxMenu::SetTitle(const wxString& label)
+void wxMenu::SetTitle( const wxString& rLabel )
 {
 {
-    bool hasNoTitle = m_title.IsEmpty();
-    m_title = label;
+    bool bHasNoTitle = m_title.empty();
+    HWND hMenu = GetHmenu();
 
 
-    HMENU hMenu = GetHmenu();
-
-    if ( hasNoTitle )
+    m_title = rLabel;
+    if (bHasNoTitle)
     {
     {
-        if ( !label.IsEmpty() )
+        if (!rLabel.empty())
         {
         {
-/*
-            if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
-                               (unsigned)idMenuTitle, m_title) ||
-                 !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
+            if (!::WinSetWindowText(hMenu, rLabel.c_str()))
             {
             {
-                wxLogLastError("InsertMenu");
+                wxLogLastError(wxT("SetMenuTitle"));
             }
             }
-*/
         }
     }
     else
     {
         }
     }
     else
     {
-        if ( label.IsEmpty() )
+        if (rLabel.empty() )
         {
         {
-/*
-            // remove the title and the separator after it
-            if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
-                 !RemoveMenu(hMenu, 0, MF_BYPOSITION) )
-            {
-                wxLogLastError("RemoveMenu");
-            }
-*/
+            ::WinSendMsg( GetHmenu()
+                         ,MM_REMOVEITEM
+                         ,MPFROM2SHORT(hMenu, TRUE)
+                         ,(MPARAM)0
+                        );
         }
         else
         {
         }
         else
         {
-/*
-            // modify the title
-            if ( !ModifyMenu(hMenu, 0u,
-                             MF_BYPOSITION | MF_STRING,
-                             (unsigned)idMenuTitle, m_title) )
+            //
+            // Modify the title
+            //
+            if (!::WinSetWindowText(hMenu, rLabel.c_str()))
             {
             {
-                wxLogLastError("ModifyMenu");
+                wxLogLastError(wxT("SetMenuTitle"));
             }
             }
-*/
-        }
-    }
-/*
-#ifdef __WIN32__
-    // put the title string in bold face
-    if ( !m_title.IsEmpty() )
-    {
-        MENUITEMINFO mii;
-        mii.cbSize = sizeof(mii);
-        mii.fMask = MIIM_STATE;
-        mii.fState = MFS_DEFAULT;
-
-        if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) )
-        {
-            wxLogLastError("SetMenuItemInfo");
         }
     }
         }
     }
-#endif // Win32
-*/
-}
+} // end of wxMenu::SetTitle
 
 // ---------------------------------------------------------------------------
 // event processing
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // event processing
 // ---------------------------------------------------------------------------
 
-bool wxMenu::OS2Command(WXUINT WXUNUSED(param), WXWORD id)
-{
-    // ignore commands from the menu title
-
-    // NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!!
-    if ( id != (WXWORD)idMenuTitle )
-    {
-        wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
-        event.SetEventObject( this );
-        event.SetId( id );
-        event.SetInt( id );
-        ProcessCommand(event);
-    }
-
-    return TRUE;
-}
-
-bool wxMenu::ProcessCommand(wxCommandEvent & event)
+bool wxMenu::OS2Command( WXUINT WXUNUSED(uParam),
+                         WXWORD vId )
 {
 {
-    bool processed = FALSE;
+    //
+    // Ignore commands from the menu title
+    //
 
 
-#if WXWIN_COMPATIBILITY
-    // Try a callback
-    if (m_callback)
+    if (vId != (WXWORD)idMenuTitle)
     {
     {
-        (void)(*(m_callback))(*this, event);
-        processed = TRUE;
+        SendEvent( vId
+                  ,(int)::WinSendMsg( GetHmenu()
+                                     ,MM_QUERYITEMATTR
+                                     ,MPFROMSHORT(vId)
+                                     ,(MPARAM)MIA_CHECKED
+                                    )
+                 );
     }
     }
-#endif // WXWIN_COMPATIBILITY
-
-    // Try the menu's event handler
-    if ( !processed && GetEventHandler())
-    {
-        processed = GetEventHandler()->ProcessEvent(event);
-    }
-
-    // Try the window the menu was popped up from (and up through the
-    // hierarchy)
-    wxWindow *win = GetInvokingWindow();
-    if ( !processed && win )
-        processed = win->GetEventHandler()->ProcessEvent(event);
-
-    return processed;
-}
+    return true;
+} // end of wxMenu::OS2Command
 
 // ---------------------------------------------------------------------------
 // other
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // other
 // ---------------------------------------------------------------------------
 
-void wxMenu::Attach(wxMenuBar *menubar)
+wxWindow* wxMenu::GetWindow() const
 {
 {
-    // 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 = menubar;
-}
+    if (m_invokingWindow != NULL)
+        return m_invokingWindow;
+    else if ( GetMenuBar() != NULL)
+        return GetMenuBar()->GetFrame();
 
 
-void wxMenu::Detach()
+    return NULL;
+} // end of wxMenu::GetWindow
+
+// recursive search for item by id
+wxMenuItem* wxMenu::FindItem(
+  int                               nItemId
+, ULONG                             hItem
+, wxMenu**                          ppItemMenu
+) const
 {
 {
-    wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") );
+    if ( ppItemMenu )
+        *ppItemMenu = NULL;
 
 
-    m_menuBar = NULL;
-}
+    wxMenuItem*                     pItem = NULL;
 
 
-wxWindow *wxMenu::GetWindow() const
-{
-    if ( m_invokingWindow != NULL )
-        return m_invokingWindow;
-    else if ( m_menuBar != NULL)
-        return m_menuBar->GetFrame();
+    for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
+          node && !pItem;
+          node = node->GetNext() )
+    {
+        pItem = node->GetData();
 
 
-    return NULL;
-}
+        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
@@ -493,393 +676,500 @@ void wxMenuBar::Init()
     m_eventHandler = this;
     m_menuBarFrame = NULL;
     m_hMenu = 0;
     m_eventHandler = this;
     m_menuBarFrame = NULL;
     m_hMenu = 0;
-}
+} // end of wxMenuBar::Init
 
 wxMenuBar::wxMenuBar()
 {
     Init();
 
 wxMenuBar::wxMenuBar()
 {
     Init();
-}
+} // end of wxMenuBar::wxMenuBar
 
 
-wxMenuBar::wxMenuBar( long WXUNUSED(style) )
+wxMenuBar::wxMenuBar(
+ long                               WXUNUSED(lStyle)
+)
 {
     Init();
 {
     Init();
-}
+} // end of wxMenuBar::wxMenuBar
 
 
-wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[])
+wxMenuBar::wxMenuBar(
+  int                               nCount
+, wxMenu*                           vMenus[]
+, const wxString                    sTitles[]
+, long                              WXUNUSED(lStyle)
+)
 {
     Init();
 
 {
     Init();
 
-    m_titles.Alloc(count);
-
-    for ( int i = 0; i < count; i++ )
+    m_titles.Alloc(nCount);
+    for ( int i = 0; i < nCount; i++ )
     {
     {
-        m_menus.Append(menus[i]);
-        m_titles.Add(titles[i]);
-
-        menus[i]->Attach(this);
+        m_menus.Append(vMenus[i]);
+        m_titles.Add(sTitles[i]);
+        vMenus[i]->Attach(this);
     }
     }
-}
+} // end of 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
 
 // ---------------------------------------------------------------------------
 // wxMenuBar helpers
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // wxMenuBar helpers
 // ---------------------------------------------------------------------------
 
-void wxMenuBar::Refresh(
-  bool                              WXUNUSED(bEraseBackground)
-, const wxRect*                     WXUNUSED(pRect)
-)
+void wxMenuBar::Refresh()
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
 
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
 
-//    DrawMenuBar(GetHwndOf(m_menuBarFrame));
-}
+    WinSendMsg(GetWinHwnd(m_menuBarFrame), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+} // end of wxMenuBar::Refresh
 
 WXHMENU wxMenuBar::Create()
 {
 
 WXHMENU wxMenuBar::Create()
 {
+    HWND hFrame;
+
     if (m_hMenu != 0 )
         return m_hMenu;
 
     if (m_hMenu != 0 )
         return m_hMenu;
 
-    wxCHECK_MSG( !m_hMenu, TRUE, wxT("menubar already created") );
-
-// TODO:
-/*
+    wxCHECK_MSG(!m_hMenu, TRUE, wxT("menubar already created"));
 
 
-    m_hMenu = (WXHMENU)::CreateMenu();
-
-    if ( !m_hMenu )
+    //
+    // Menubars should be associated with a frame otherwise they are popups
+    //
+    if (m_menuBarFrame != NULL)
+        hFrame = GetWinHwnd(m_menuBarFrame);
+    else
+        hFrame = HWND_DESKTOP;
+    //
+    // Create an empty menu and then fill it with insertions
+    //
+    if ((m_hMenu =  ::WinCreateWindow( hFrame
+                                      ,WC_MENU
+                                      ,NULL
+                                      ,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE
+                                      ,0L
+                                      ,0L
+                                      ,0L
+                                      ,0L
+                                      ,hFrame
+                                      ,HWND_TOP
+                                      ,FID_MENU
+                                      ,NULL
+                                      ,NULL
+                                     )) == 0)
     {
     {
-        wxLogLastError("CreateMenu");
+        wxLogLastError(wxT("WinLoadMenu"));
     }
     else
     {
     }
     else
     {
-        size_t count = GetMenuCount();
-        for ( size_t i = 0; i < count; i++ )
+        size_t nCount = GetMenuCount(), i;
+        wxMenuList::iterator it;
+        for (i = 0, it = m_menus.begin(); i < nCount; i++, it++)
         {
         {
-            if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
-                               (UINT)m_menus[i]->GetHMenu(),
-                               m_titles[i]) )
+            APIRET   rc;
+            ERRORID  vError;
+            wxString sError;
+            HWND     hSubMenu;
+
+            //
+            // Set the parent and owner of the submenues to be the menubar, not the desktop
+            //
+            hSubMenu = (*it)->m_vMenuData.hwndSubMenu;
+            if (!::WinSetParent((*it)->m_vMenuData.hwndSubMenu, m_hMenu, FALSE))
+            {
+                vError = ::WinGetLastError(vHabmain);
+                sError = wxPMErrorToStr(vError);
+                wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str());
+                return NULLHANDLE;
+            }
+
+            if (!::WinSetOwner((*it)->m_vMenuData.hwndSubMenu, m_hMenu))
             {
             {
-                wxLogLastError("AppendMenu");
+                vError = ::WinGetLastError(vHabmain);
+                sError = wxPMErrorToStr(vError);
+                wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str());
+                return NULLHANDLE;
+            }
+
+            (*it)->m_vMenuData.iPosition = (SHORT)i;
+
+            rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].wx_str());
+            if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
+            {
+                vError = ::WinGetLastError(vHabmain);
+                sError = wxPMErrorToStr(vError);
+                wxLogError(wxT("Error inserting or appending a menuitem. Error: %s\n"), sError.c_str());
+                return NULLHANDLE;
             }
         }
     }
             }
         }
     }
-
     return m_hMenu;
     return m_hMenu;
-*/
-    return (WXHMENU)0;
-}
+} // end of wxMenuBar::Create
 
 // ---------------------------------------------------------------------------
 // wxMenuBar functions to work with the top level submenus
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // wxMenuBar functions to work with the top level submenus
 // ---------------------------------------------------------------------------
 
+//
 // NB: we don't support owner drawn top level items for now, if we do these
 //     functions would have to be changed to use wxMenuItem as well
 // NB: we don't support owner drawn top level items for now, if we do these
 //     functions would have to be changed to use wxMenuItem as well
-
-void wxMenuBar::EnableTop(size_t pos, bool enable)
+//
+void wxMenuBar::EnableTop(
+  size_t                            nPos
+, bool                              bEnable
+)
 {
 {
-    wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
+    wxCHECK_RET(IsAttached(), wxT("doesn't work with unattached menubars"));
+    USHORT                          uFlag = 0;
+    SHORT                           nId;
 
 
-//    int flag = enable ? MF_ENABLED : MF_GRAYED;
-
-//    EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag);
+    if(!bEnable)
+       uFlag = MIA_DISABLED;
 
 
+    nId = SHORT1FROMMR(::WinSendMsg((HWND)m_hMenu, MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0));
+    if (nId == MIT_ERROR)
+    {
+        wxLogLastError(wxT("LogLastError"));
+        return;
+    }
+    ::WinSendMsg((HWND)m_hMenu, MM_SETITEMATTR, MPFROM2SHORT(nId, TRUE), MPFROM2SHORT(MIA_DISABLED, uFlag));
     Refresh();
     Refresh();
-}
+} // end of wxMenuBar::EnableTop
 
 
-void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
+void wxMenuBar::SetMenuLabel(
+  size_t                            nPos
+, const wxString&                   rLabel
+)
 {
 {
-    wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
+    SHORT                           nId;
+    MENUITEM                        vItem;
 
 
-    m_titles[pos] = label;
+    wxCHECK_RET(nPos < GetMenuCount(), wxT("invalid menu index"));
+    m_titles[nPos] = rLabel;
 
 
-    if ( !IsAttached() )
+    if (!IsAttached())
     {
         return;
     }
     {
         return;
     }
-    //else: have to modify the existing menu
 
 
-// TODO:
-/*
-    UINT id;
-    UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION);
-    if ( flagsOld == 0xFFFFFFFF )
+    nId = SHORT1FROMMR(::WinSendMsg((HWND)m_hMenu, MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0));
+    if (nId == MIT_ERROR)
     {
     {
-        wxLogLastError(wxT("GetMenuState"));
-
+        wxLogLastError(wxT("LogLastError"));
         return;
     }
         return;
     }
-
-    if ( flagsOld & MF_POPUP )
-    {
-        // HIBYTE contains the number of items in the submenu in this case
-        flagsOld &= 0xff;
-        id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos);
-    }
-    else
+    if(!::WinSendMsg( (HWND)m_hMenu
+                     ,MM_QUERYITEM
+                     ,MPFROM2SHORT(nId, TRUE)
+                     ,MPARAM(&vItem)
+                    ))
     {
     {
-        id = pos;
+        wxLogLastError(wxT("QueryItem"));
     }
     }
+    nId = vItem.id;
 
 
-    if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld,
-                      id, label) == (int)0xFFFFFFFF )
+    if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.wx_str()));
     {
     {
-        wxLogLastError("ModifyMenu");
+        wxLogLastError(wxT("ModifyMenu"));
     }
     }
-*/
     Refresh();
     Refresh();
-}
+} // end of wxMenuBar::SetMenuLabel
 
 
-wxString wxMenuBar::GetLabelTop(size_t pos) const
+wxString wxMenuBar::GetMenuLabel(
+  size_t                            nPos
+) const
 {
 {
-    wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
-                 wxT("invalid menu index in wxMenuBar::GetLabelTop") );
-
-    return m_titles[pos];
-}
-
-int wxMenuBar::FindMenu(const wxString& title)
-{
-    wxString menuTitle = wxStripMenuCodes(title);
-
-    size_t count = GetMenuCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        wxString title = wxStripMenuCodes(m_titles[i]);
-        if ( menuTitle == title )
-            return i;
-    }
-
-    return wxNOT_FOUND;
-
-}
+    wxCHECK_MSG( nPos < GetMenuCount(), wxEmptyString,
+                 wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
+    return m_titles[nPos];
+} // end of wxMenuBar::GetMenuLabel
 
 // ---------------------------------------------------------------------------
 // wxMenuBar construction
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // wxMenuBar construction
 // ---------------------------------------------------------------------------
 
-wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
+wxMenu* wxMenuBar::Replace(
+  size_t                             nPos
+, wxMenu*                            pMenu
+, const wxString&                    rTitle
+)
 {
 {
-    wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
-    if ( !menuOld )
-        return FALSE;
-    m_titles[pos] = title;
-// TODO:
-/*
-    if ( IsAttached() )
-    {
-        // can't use ModifyMenu() because it deletes the submenu it replaces
-        if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
-        {
-            wxLogLastError("RemoveMenu");
-        }
+    SHORT                            nId;
+    wxString                         sTitle = wxPMTextToLabel(rTitle);
+    wxMenu*                          pMenuOld = wxMenuBarBase::Replace( nPos
+                                                                       ,pMenu
+                                                                       ,sTitle
+                                                                      );
 
 
-        if ( !::InsertMenu(GetHmenu(), (UINT)pos,
-                           MF_BYPOSITION | MF_POPUP | MF_STRING,
-                           (UINT)GetHmenuOf(menu), title) )
-        {
-            wxLogLastError("InsertMenu");
-        }
+
+    nId = SHORT1FROMMR(::WinSendMsg((HWND)m_hMenu, MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0));
+    if (nId == MIT_ERROR)
+    {
+        wxLogLastError(wxT("LogLastError"));
+        return NULL;
+    }
+    if (!pMenuOld)
+        return NULL;
+    m_titles[nPos] = sTitle;
+    if (IsAttached())
+    {
+        ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
+        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());
 
 #if wxUSE_ACCEL
 
 #if wxUSE_ACCEL
-        if ( menuOld->HasAccels() || menu->HasAccels() )
+        if (pMenuOld->HasAccels() || pMenu->HasAccels())
         {
         {
-            // need to rebuild accell table
+            //
+            // Need to rebuild accell table
+            //
             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL
             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL
-
         Refresh();
     }
         Refresh();
     }
-*/
-    return menuOld;
-}
+    return pMenuOld;
+} // end of wxMenuBar::Replace
 
 
-bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
+bool wxMenuBar::Insert( size_t          nPos,
+                        wxMenu*         pMenu,
+                        const wxString& rTitle )
 {
 {
-    if ( !wxMenuBarBase::Insert(pos, menu, title) )
-        return FALSE;
+    wxString sTitle = wxPMTextToLabel(rTitle);
 
 
-    m_titles.Insert(title, pos);
+    if (!wxMenuBarBase::Insert( nPos, pMenu, sTitle ))
+        return false;
 
 
-    menu->Attach(this);
-// TODO:
-/*
-    if ( IsAttached() )
-    {
-        if ( !::InsertMenu(GetHmenu(), pos,
-                           MF_BYPOSITION | MF_POPUP | MF_STRING,
-                           (UINT)GetHmenuOf(menu), title) )
-        {
-            wxLogLastError("InsertMenu");
-        }
+    m_titles.Insert( sTitle, nPos );
 
 
+    if (IsAttached())
+    {
+        pMenu->m_vMenuData.iPosition = (SHORT)nPos;
+        ::WinSendMsg( (HWND)m_hMenu
+                     ,MM_INSERTITEM
+                     ,(MPARAM)&pMenu->m_vMenuData
+                     ,(MPARAM)sTitle.wx_str()
+                    );
 #if wxUSE_ACCEL
 #if wxUSE_ACCEL
-        if ( menu->HasAccels() )
+        if (pMenu->HasAccels())
         {
             // need to rebuild accell table
             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL
         {
             // need to rebuild accell table
             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL
-
         Refresh();
     }
         Refresh();
     }
-*/
-    return TRUE;
-}
 
 
-bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
+    return true;
+} // end of wxMenuBar::Insert
+
+bool wxMenuBar::Append( wxMenu* pMenu,
+                        const wxString& rsTitle )
 {
 {
-    WXHMENU submenu = menu ? menu->GetHMenu() : 0;
-    wxCHECK_MSG( submenu, 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 sTitle = wxPMTextToLabel(rsTitle);
 
 
-    if ( !wxMenuBarBase::Append(menu, title) )
-        return FALSE;
+    if (!wxMenuBarBase::Append(pMenu, sTitle))
+        return false;
 
 
-    menu->Attach(this);
+    m_titles.Add(sTitle);
 
 
-    m_titles.Add(title);
-// TODO:
-/*
     if ( IsAttached() )
     {
     if ( IsAttached() )
     {
-        if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
-                           (UINT)submenu, title) )
-        {
-            wxLogLastError(wxT("AppendMenu"));
-        }
-
+        pMenu->m_vMenuData.iPosition = MIT_END;
+        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());
 #if wxUSE_ACCEL
 #if wxUSE_ACCEL
-        if ( menu->HasAccels() )
+        if (pMenu->HasAccels())
         {
         {
-            // need to rebuild accell table
+            //
+            // Need to rebuild accell table
+            //
             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL
             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL
-
         Refresh();
     }
         Refresh();
     }
-*/
-    return TRUE;
-}
+    return true;
+} // end of wxMenuBar::Append
 
 
-wxMenu *wxMenuBar::Remove(size_t pos)
+wxMenu* wxMenuBar::Remove(
+  size_t                            nPos
+)
 {
 {
-    wxMenu *menu = wxMenuBarBase::Remove(pos);
-    if ( !menu )
+    wxMenu*                         pMenu = wxMenuBarBase::Remove(nPos);
+    SHORT                           nId;
+
+    if (!pMenu)
         return NULL;
         return NULL;
-// TODO:
-/*
-    if ( IsAttached() )
-    {
-        if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
-        {
-            wxLogLastError("RemoveMenu");
-        }
 
 
-        menu->Detach();
+    nId = SHORT1FROMMR(::WinSendMsg( (HWND)GetHmenu()
+                                    ,MM_ITEMIDFROMPOSITION
+                                    ,MPFROMSHORT(nPos)
+                                    ,(MPARAM)0)
+                                   );
+    if (nId == MIT_ERROR)
+    {
+        wxLogLastError(wxT("LogLastError"));
+        return NULL;
+    }
+    if (IsAttached())
+    {
+        ::WinSendMsg( (HWND)GetHmenu()
+                     ,MM_REMOVEITEM
+                     ,MPFROM2SHORT(nId, TRUE)
+                     ,(MPARAM)0
+                    );
 
 #if wxUSE_ACCEL
 
 #if wxUSE_ACCEL
-        if ( menu->HasAccels() )
+        if (pMenu->HasAccels())
         {
         {
-            // need to rebuild accell table
+            //
+            // Need to rebuild accell table
+            //
             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL
             RebuildAccelTable();
         }
 #endif // wxUSE_ACCEL
-
         Refresh();
     }
         Refresh();
     }
-
-    m_titles.Remove(pos);
-*/
-    return menu;
-}
+    m_titles.RemoveAt(nPos);
+    return pMenu;
+} // end of wxMenuBar::Remove
 
 #if wxUSE_ACCEL
 
 void wxMenuBar::RebuildAccelTable()
 {
 
 #if wxUSE_ACCEL
 
 void wxMenuBar::RebuildAccelTable()
 {
-    // merge the accelerators of all menus into one accel table
-    size_t nAccelCount = 0;
-    size_t i, count = GetMenuCount();
-    for ( i = 0; i < count; i++ )
+    //
+    // Merge the accelerators of all menus into one accel table
+    //
+    size_t                          nAccelCount = 0;
+    size_t                          i;
+    size_t                          nCount = GetMenuCount();
+    wxMenuList::iterator it;
+    for (i = 0, it = m_menus.begin(); i < nCount; i++, it++)
     {
     {
-        nAccelCount += m_menus[i]->GetAccelCount();
+        nAccelCount += (*it)->GetAccelCount();
     }
 
     }
 
-    if ( nAccelCount )
+    if (nAccelCount)
     {
     {
-        wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
+        wxAcceleratorEntry*         pAccelEntries = new wxAcceleratorEntry[nAccelCount];
 
         nAccelCount = 0;
 
         nAccelCount = 0;
-        for ( i = 0; i < count; i++ )
+        for (i = 0, it = m_menus.begin(); i < nCount; i++, it++)
         {
         {
-            nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]);
+            nAccelCount += (*it)->CopyAccels(&pAccelEntries[nAccelCount]);
         }
         }
-
-        m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
-
-        delete [] accelEntries;
+        m_vAccelTable = wxAcceleratorTable( nAccelCount
+                                           ,pAccelEntries
+                                          );
+        delete [] pAccelEntries;
     }
     }
-}
+} // end of wxMenuBar::RebuildAccelTable
 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 
-void wxMenuBar::Attach(wxFrame *frame)
+void wxMenuBar::Attach(
+  wxFrame*                          pFrame
+)
 {
 {
-    wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
-
-    m_menuBarFrame = frame;
+    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(wxT("WinSetAccelTable"));
+    }
 #endif // wxUSE_ACCEL
 #endif // wxUSE_ACCEL
-}
+} // end of wxMenuBar::Attach
 
 void wxMenuBar::Detach()
 {
 
 void wxMenuBar::Detach()
 {
-//    ::DestroyMenu((HMENU)m_hMenu);
+    ::WinDestroyWindow((HWND)m_hMenu);
     m_hMenu = (WXHMENU)NULL;
     m_menuBarFrame = NULL;
     m_hMenu = (WXHMENU)NULL;
     m_menuBarFrame = NULL;
-}
-
+} // end of wxMenuBar::Detach
 
 // ---------------------------------------------------------------------------
 // wxMenuBar searching for menu items
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // wxMenuBar searching for menu items
 // ---------------------------------------------------------------------------
 
+//
 // Find the itemString in menuString, and return the item id or wxNOT_FOUND
 // Find the itemString in menuString, and return the item id or wxNOT_FOUND
-int wxMenuBar::FindMenuItem(const wxString& menuString,
-                            const wxString& itemString) const
+//
+int wxMenuBar::FindMenuItem(
+  const wxString&                   rMenuString
+, const wxString&                   rItemString
+) const
 {
 {
-    wxString menuLabel = wxStripMenuCodes(menuString);
-    size_t count = GetMenuCount();
-    for ( size_t i = 0; i < count; i++ )
+    wxString                        sMenuLabel = wxStripMenuCodes(rMenuString);
+    size_t                          nCount = GetMenuCount(), i;
+    wxMenuList::const_iterator it;
+    for (i = 0, it = m_menus.begin(); i < nCount; i++, it++)
     {
     {
-        wxString title = wxStripMenuCodes(m_titles[i]);
-        if ( menuString == title )
-            return m_menus[i]->FindItem(itemString);
-    }
+        wxString                    sTitle = wxStripMenuCodes(m_titles[i]);
 
 
+        if (rMenuString == sTitle)
+            return (*it)->FindItem(rItemString);
+    }
     return wxNOT_FOUND;
     return wxNOT_FOUND;
-}
+} // end of wxMenuBar::FindMenuItem
 
 
-wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const
+wxMenuItem* wxMenuBar::FindItem(
+  int                               nId
+, wxMenu**                          ppItemMenu
+) const
 {
 {
-    if ( itemMenu )
-        *itemMenu = NULL;
+    if (ppItemMenu)
+        *ppItemMenu = NULL;
 
 
-    wxMenuItem *item = NULL;
-    size_t count = GetMenuCount();
-    for ( size_t i = 0; !item && (i < count); i++ )
+    wxMenuItem*                     pItem = NULL;
+    size_t                          nCount = GetMenuCount(), i;
+    wxMenuList::const_iterator it;
+    for (i = 0, it = m_menus.begin(); !pItem && (i < nCount); i++, it++)
     {
     {
-        item = m_menus[i]->FindItem(id, itemMenu);
+        pItem = (*it)->FindItem( nId
+                                ,ppItemMenu
+                               );
     }
     }
+    return pItem;
+} // end of wxMenuBar::FindItem
+
+wxMenuItem* wxMenuBar::FindItem(
+  int                               nId
+, ULONG                             hItem
+, wxMenu**                          ppItemMenu
+) const
+{
+    if (ppItemMenu)
+        *ppItemMenu = NULL;
 
 
-    return item;
-}
-
+    wxMenuItem*                     pItem = NULL;
+    size_t                          nCount = GetMenuCount(), i;
+    wxMenuList::const_iterator it;
+    for (i = 0, it = m_menus.begin(); !pItem && (i < nCount); i++, it++)
+    {
+        pItem = (*it)->FindItem( nId
+                                ,hItem
+                                ,ppItemMenu
+                               );
+    }
+    return pItem;
+} // end of wxMenuBar::FindItem
wxWidgets (Impactor)