X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/987da0d4116e93c1d326b29272c28ee9f989b87c..e1082c9fa8763696ea87c75b1435db9d3a2e1d7c:/src/os2/menu.cpp

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 971cff759b..ccf5fce86f 100644
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -188,6 +188,14 @@ void wxMenu::Break()
 
 #if wxUSE_ACCEL
 
+void wxMenu::EndRadioGroup()
+{
+    //
+    // We're not inside a radio group any longer
+    //
+    m_nStartRadioGroup = -1;
+} // end of wxMenu::EndRadioGroup
+
 int wxMenu::FindAccel(
   int                               nId
 ) const
@@ -398,8 +406,64 @@ bool wxMenu::DoAppend(
   wxMenuItem*                       pItem
 )
 {
-    return wxMenuBase::DoAppend(pItem) && DoInsertOrAppend(pItem);
-}
+    wxCHECK_MSG( pItem, FALSE, _T("NULL item in wxMenu::DoAppend") );
+
+    bool                            bCheck = FALSE;
+
+    if (pItem->GetKind() == wxITEM_RADIO)
+    {
+        int                         nCount = GetMenuItemCount();
+
+        if (m_nStartRadioGroup == -1)
+        {
+            //
+            // Start a new radio group
+            //
+            m_nStartRadioGroup = nCount;
+
+            //
+            // For now it has just one element
+            //
+            pItem->SetAsRadioGroupStart();
+            pItem->SetRadioGroupEnd(m_nStartRadioGroup);
+
+            //
+            // Ensure that we have a checked item in the radio group
+            //
+            bCheck = TRUE;
+        }
+        else // extend the current radio group
+        {
+            //
+            // We need to update its end item
+            //
+            pItem->SetRadioGroupStart(m_nStartRadioGroup);
+            wxMenuItemList::Node*   pNode = GetMenuItems().Item(m_nStartRadioGroup);
+
+            if (pNode)
+            {
+                pNode->GetData()->SetRadioGroupEnd(nCount);
+            }
+            else
+            {
+                wxFAIL_MSG( _T("where is the radio group start item?") );
+            }
+        }
+    }
+    else // not a radio item
+    {
+        EndRadioGroup();
+    }
+    if (!wxMenuBase::DoAppend(pItem) || !DoInsertOrAppend(pItem))
+    {
+        return FALSE;
+    }
+    if (bCheck)
+    {
+        pItem->Check(TRUE);
+    }
+    return TRUE;
+} // end of wxMenu::DoInsert
 
 bool wxMenu::DoInsert(
   size_t                            nPos
@@ -628,7 +692,7 @@ wxMenuItem* wxMenu::FindItem(
 void wxMenuBar::Init()
 {
     m_eventHandler = this;
-    m_pMenuBarFrame = NULL;
+    m_menuBarFrame = NULL;
     m_hMenu = 0;
 } // end of wxMenuBar::Init
 
@@ -673,7 +737,7 @@ void wxMenuBar::Refresh()
 {
     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()
@@ -689,8 +753,8 @@ WXHMENU wxMenuBar::Create()
     //
     // 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;
     //
@@ -900,8 +964,6 @@ bool wxMenuBar::Insert(
                     ,nPos
                    );
 
-    pMenu->Attach(this);
-
     if (IsAttached())
     {
         ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());
@@ -969,7 +1031,6 @@ wxMenu* wxMenuBar::Remove(
     if (IsAttached())
     {
         ::WinSendMsg((HWND)GetHmenu(), MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
-        pMenu->Detach();
 
 #if wxUSE_ACCEL
         if (pMenu->HasAccels())
@@ -1025,7 +1086,6 @@ void wxMenuBar::Attach(
 )
 {
     wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
-    m_pMenuBarFrame = pFrame;
 
 #if wxUSE_ACCEL
     RebuildAccelTable();
@@ -1044,7 +1104,7 @@ void wxMenuBar::Detach()
 {
     ::WinDestroyWindow((HWND)m_hMenu);
     m_hMenu = (WXHMENU)NULL;
-    m_pMenuBarFrame = NULL;
+    m_menuBarFrame = NULL;
 } // end of wxMenuBar::Detach
 
 // ---------------------------------------------------------------------------