Fixed incorrect ratio initialization

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

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index f6f689e9eb4232940e3c511db7cf3b808a58203d..a834dd5e855bbd9d46248f215f862e53b9dc3beb 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -52,11 +52,7 @@ static const int                    idMenuTitle = -2;
 //
 // The unique ID for Menus
 //
 //
 // The unique ID for Menus
 //

-#ifdef __VISAGECPP__

 USHORT                              wxMenu::m_nextMenuId = 0;
 USHORT                              wxMenu::m_nextMenuId = 0;

-#else
-static USHORT                       wxMenu::m_nextMenuId = 0;
-#endif

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


@@ -65,44 +61,6 @@ static USHORT                       wxMenu::m_nextMenuId = 0;
     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
 // ============================================================================


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

+    m_nStartRadioGroup = -1;

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


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

+               ,wxEmptyString
+               ,wxITEM_NORMAL

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


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

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

     WX_CLEAR_ARRAY(m_vAccels);
     WX_CLEAR_ARRAY(m_vAccels);

-#endif

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


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


@@ -200,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
 


@@ -211,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
 


@@ -263,28 +241,17 @@ bool wxMenu::DoInsertOrAppend(
 , size_t                            nPos
 )
 {
 , size_t                            nPos
 )
 {

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

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

-    char                            zMsg[128];
+

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

-    //
-    // rItem is the member MENUITEM for the  menu items and the submenu's
-    // MENUITEM for submenus as required by ::MM_INSERTITEM message API
-    //
-
-    wxMenu*                         pSubmenu = pItem->GetSubMenu();
-    MENUITEM&                       rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
-                                            pItem->m_vMenuData;
-    if(pSubmenu != NULL)
-    {
-        wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
-        pSubmenu->SetParent(this);
-        rItem.afStyle |= MIS_SUBMENU | MIS_TEXT;
-    }
-

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


@@ -295,24 +262,18 @@ bool wxMenu::DoInsertOrAppend(
         m_bDoBreak = FALSE;
     }
 
         m_bDoBreak = FALSE;
     }
 

-    if (pItem->IsSeparator())
-    {
-        rItem.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
     //

-

     if (pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
         pSubmenu->SetParent(this);
 
         rItem.iPosition = 0; // submenus have a 0 position
     if (pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
         pSubmenu->SetParent(this);
 
         rItem.iPosition = 0; // submenus have a 0 position

-        rItem.id = (USHORT)pSubmenu->GetHMenu();
-        rItem.afStyle |= MIS_SUBMENU | MIS_TEXT;
+        rItem.id        = (USHORT)pSubmenu->GetHMenu();
+        rItem.afStyle  |= MIS_SUBMENU | MIS_TEXT;

     }
     else
     {
     }
     else
     {


@@ -329,14 +290,19 @@ bool wxMenu::DoInsertOrAppend(
         // 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
         //
         // 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 = (BYTE*)NULL;
-        rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP();
+        rItem.afStyle             |= MIS_OWNERDRAW;
+        pData                      = (BYTE*)NULL;
+        rItem.hItem                = (HBITMAP)pItem->GetBitmap().GetHBITMAP();

         pItem->m_vMenuData.afStyle = rItem.afStyle;
         pItem->m_vMenuData.afStyle = rItem.afStyle;

-        pItem->m_vMenuData.hItem = rItem.hItem;
+        pItem->m_vMenuData.hItem   = rItem.hItem;

     }
     else
 #endif
     }
     else
 #endif

+    if (pItem->IsSeparator())
+    {
+        rItem.afStyle = MIS_SEPARATOR;
+    }
+    else

     {
         //
         // Menu is just a normal string (passed in data parameter)
     {
         //
         // Menu is just a normal string (passed in data parameter)


@@ -364,7 +330,6 @@ bool wxMenu::DoInsertOrAppend(
 #if wxUSE_OWNER_DRAWN
     if (pItem->IsOwnerDrawn())
     {
 #if wxUSE_OWNER_DRAWN
     if (pItem->IsOwnerDrawn())
     {

-        BOOL                       rc;

         MENUITEM                   vMenuItem;
 
         ::WinSendMsg( GetHmenu()
         MENUITEM                   vMenuItem;
 
         ::WinSendMsg( GetHmenu()


@@ -376,11 +341,11 @@ bool wxMenu::DoInsertOrAppend(
                     );
     }
 #endif
                     );
     }
 #endif

-    if (rc == MIT_MEMERROR || rc == MIT_ERROR)
+    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;
     }


@@ -389,32 +354,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);
+
+            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

 
 

-bool wxMenu::DoInsert(
+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(


@@ -448,7 +485,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


@@ -460,12 +497,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();

     }
 
     //
     }
 
     //


@@ -559,79 +596,27 @@ 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


@@ -661,7 +646,12 @@ wxMenuItem* wxMenu::FindItem(
         }
         else if ( pItem->IsSubMenu() )
         {
         }
         else if ( pItem->IsSubMenu() )
         {

-            pItem = pItem->GetSubMenu()->FindItem(nItemId, hItem, ppItemMenu);
+            pItem = pItem->GetSubMenu()->FindItem( nItemId
+                                                  ,hItem
+                                                  ,ppItemMenu
+                                                 );
+            if (pItem)
+                break;

         }
         else
         {
         }
         else
         {


@@ -679,7 +669,7 @@ wxMenuItem* wxMenu::FindItem(
 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
 


@@ -714,6 +704,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
 
 // ---------------------------------------------------------------------------


@@ -724,12 +723,11 @@ 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;
 
     if (m_hMenu != 0 )
     HWND                            hFrame;
 
     if (m_hMenu != 0 )


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

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

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


@@ -783,7 +781,7 @@ WXHMENU wxMenuBar::Create()
             {
                 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;
             }
 


@@ -791,18 +789,18 @@ WXHMENU wxMenuBar::Create()
             {
                 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;
 
             rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&m_menus[i]->m_vMenuData, (MPARAM)m_titles[i].c_str());
                 return NULLHANDLE;
             }
 
             m_menus[i]->m_vMenuData.iPosition = i;
 
             rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&m_menus[i]->m_vMenuData, (MPARAM)m_titles[i].c_str());

-            if (rc == MIT_MEMERROR || rc == MIT_ERROR)
+            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;
             }
         }


@@ -899,10 +897,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

                                                                       );
 
 
                                                                       );
 
 


@@ -913,12 +911,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())
     {
         ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
     if (IsAttached())
     {
         ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);

-        ::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 (pMenuOld->HasAccels() || pMenu->HasAccels())
 
 #if wxUSE_ACCEL
         if (pMenuOld->HasAccels() || pMenu->HasAccels())


@@ -940,22 +938,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())
         {


@@ -970,24 +972,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())
         {


@@ -1012,7 +1014,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");


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

-        ::WinSendMsg((HWND)GetHmenu(), MM_REMOVEITEM, 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())


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

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

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


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

-                            ,(HWND)pFrame->GetHWND()

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

+                            ,(HWND)pFrame->GetFrame()

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


@@ -1096,7 +1104,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
 
 // ---------------------------------------------------------------------------