Some more fiddling with two-window approach and

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 761e549f2c263aceabe4c8157be67d2a3b8113ac..b54fd5783c8329d79c117e38cb2d4d269c47ee20 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -108,21 +108,61 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 wxMenuItem::wxMenuItem(
   wxMenu*                           pParentMenu
 , int                               nId
-, const wxString&                   rText
-, const wxString&                   rStrHelp
-, bool                              bCheckable
+, const wxString&                   rsText
+, const wxString&                   rsHelp
+, wxItemKind                        eKind
 , wxMenu*                           pSubMenu
 )
+: wxMenuItemBase( pParentMenu
+                 ,nId
+                 ,rsText
+                 ,rsHelp
+                 ,eKind
+                 ,pSubMenu
+                )
 #if wxUSE_OWNER_DRAWN
-:  wxOwnerDrawn( TextToLabel(rText)
-                ,bCheckable
+,  wxOwnerDrawn( TextToLabel(rsText)
+                ,eKind == wxITEM_CHECK
                )
 #endif // owner drawn
 {
     wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent"));
 
-#if  wxUSE_OWNER_DRAWN
+    Init();
+} // end of wxMenuItem::wxMenuItem
 
+wxMenuItem::wxMenuItem(
+  wxMenu*                           pParentMenu
+, int                               nId
+, const wxString&                   rsText
+, const wxString&                   rsHelp
+, bool                              bIsCheckable
+, wxMenu*                           pSubMenu
+)
+: wxMenuItemBase( pParentMenu
+                 ,nId
+                 ,rsText
+                 ,rsHelp
+                 ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL
+                 ,pSubMenu
+                )
+#if wxUSE_OWNER_DRAWN
+,  wxOwnerDrawn( TextToLabel(rsText)
+                ,bIsCheckable
+               )
+#endif // owner drawn
+{
+    wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent"));
+
+    Init();
+} // end of wxMenuItem::wxMenuItem
+
+void wxMenuItem::Init()
+{
+    m_vRadioGroup.m_nStart = -1;
+    m_bIsRadioGroupStart = FALSE;
+
+#if  wxUSE_OWNER_DRAWN
     //
     // Set default menu colors
     //
@@ -131,25 +171,19 @@ wxMenuItem::wxMenuItem(
     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));
 
+    #undef  SYS_COLOR
+
     //
     // We don't want normal items be owner-drawn
     //
     ResetOwnerDrawn();
 
-    #undef  SYS_COLOR
+    //
+    // Tell the owner drawing code to to show the accel string as well
+    //
+    SetAccelString(m_text.AfterFirst(_T('\t')));
 #endif // wxUSE_OWNER_DRAWN
-
-    m_parentMenu  = pParentMenu;
-    m_subMenu     = pSubMenu;
-    m_isEnabled   = TRUE;
-    m_isChecked   = FALSE;
-    m_id          = nId;
-    m_text        = TextToLabel(rText);
-    m_isCheckable = bCheckable;
-    m_help        = rStrHelp;
-    memset(&m_vMenuData, '\0', sizeof(m_vMenuData));
-    m_vMenuData.id= nId;
-} // end of wxMenuItem::wxMenuItem
+} // end of wxMenuItem::Init
 
 wxMenuItem::~wxMenuItem()
 {
@@ -200,6 +234,34 @@ wxString wxMenuItemBase::GetLabelFromText(
     return label;
 }
 
+// radio group stuff
+// -----------------
+
+void wxMenuItem::SetAsRadioGroupStart()
+{
+    m_bIsRadioGroupStart = TRUE;
+} // end of wxMenuItem::SetAsRadioGroupStart
+
+void wxMenuItem::SetRadioGroupStart(
+  int                               nStart
+)
+{
+    wxASSERT_MSG( !m_bIsRadioGroupStart,
+                  _T("should only be called for the next radio items") );
+
+    m_vRadioGroup.m_nStart = nStart;
+} // end of wxMenuItem::SetRadioGroupStart
+
+void wxMenuItem::SetRadioGroupEnd(
+  int                               nEnd
+)
+{
+    wxASSERT_MSG( m_bIsRadioGroupStart,
+                  _T("should only be called for the first radio item") );
+
+    m_vRadioGroup.m_nEnd = nEnd;
+} // end of wxMenuItem::SetRadioGroupEnd
+
 // change item state
 // -----------------
 
@@ -236,21 +298,96 @@ void wxMenuItem::Check(
 {
     bool                            bOk;
 
-    wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") );
+    wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );
     if (m_isChecked == bCheck)
         return;
-    if (bCheck)
-        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
-                                 ,MM_SETITEMATTR
-                                 ,MPFROM2SHORT(GetRealId(), TRUE)
-                                 ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
-                                );
-    else
-        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
-                                 ,MM_SETITEMATTR
-                                 ,MPFROM2SHORT(GetRealId(), TRUE)
-                                 ,MPFROM2SHORT(MIA_CHECKED, FALSE)
-                                );
+
+    HMENU                           hMenu = GetHMenuOf(m_parentMenu);
+
+    if ( GetKind() == wxITEM_RADIO )
+    {
+        //
+        // It doesn't make sense to uncheck a radio item - what would this do?
+        //
+        if (!bCheck)
+            return;
+
+        //
+        // Get the index of this item in the menu
+        //
+        const wxMenuItemList&       rItems = m_parentMenu->GetMenuItems();
+        int                         nPos = rItems.IndexOf(this);
+        int                         nStart;
+        int                         nEnd;
+
+        wxCHECK_RET( nPos != wxNOT_FOUND,
+                     _T("menuitem not found in the menu items list?") );
+
+        //
+        // Get the radio group range
+        //
+
+        if (m_bIsRadioGroupStart)
+        {
+            // we already have all information we need
+            nStart = nPos;
+            nEnd = m_vRadioGroup.m_nEnd;
+        }
+        else // Next radio group item
+        {
+            //
+            // Get the radio group end from the start item
+            //
+            nStart = m_vRadioGroup.m_nStart;
+            nEnd = rItems.Item(nStart)->GetData()->m_vRadioGroup.m_nEnd;
+        }
+
+        //
+        // Also uncheck all the other items in this radio group
+        //
+        wxMenuItemList::Node*       pNode = rItems.Item(nStart);
+
+        for (int n = nStart; n <= nEnd && pNode; n++)
+        {
+            if (n != nPos)
+            {
+                pNode->GetData()->m_isChecked = FALSE;
+            }
+
+            if (n == nPos)
+            {
+                bOk = (bool)::WinSendMsg( hMenu
+                                         ,MM_SETITEMATTR
+                                         ,MPFROM2SHORT(n, TRUE)
+                                         ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
+                                        );
+            }
+            else
+            {
+                bOk = (bool)::WinSendMsg( hMenu
+                                         ,MM_SETITEMATTR
+                                         ,MPFROM2SHORT(n, TRUE)
+                                         ,MPFROM2SHORT(MIA_CHECKED, FALSE)
+                                        );
+            }
+            pNode = pNode->GetNext();
+        }
+    }
+    else // check item
+    {
+        if (bCheck)
+            bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                     ,MM_SETITEMATTR
+                                     ,MPFROM2SHORT(GetRealId(), TRUE)
+                                     ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
+                                    );
+        else
+            bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                     ,MM_SETITEMATTR
+                                     ,MPFROM2SHORT(GetRealId(), TRUE)
+                                     ,MPFROM2SHORT(MIA_CHECKED, FALSE)
+                                    );
+    }
     if (!bOk)
     {
         wxLogLastError("CheckMenuItem");
@@ -359,7 +496,7 @@ wxMenuItem* wxMenuItemBase::New(
 , int                               nId
 , const wxString&                   rName
 , const wxString&                   rHelp
-, bool                              bIsCheckable
+, wxItemKind                        kind
 , wxMenu*                           pSubMenu
 )
 {
@@ -367,7 +504,7 @@ wxMenuItem* wxMenuItemBase::New(
                           ,nId
                           ,rName
                           ,rHelp
-                          ,bIsCheckable
+                          ,kind
                           ,pSubMenu
                          );
 } // end of wxMenuItemBase::New