Typo fix

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 3e0f891a09bc8022a9a2739544eaf981511e2e1f..574fea6166f10423b0d1eb047f3dc69c5cfb13e9 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -153,6 +153,8 @@ wxMenuItem::wxMenuItem(
 #endif // owner drawn
 {
     wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent"));
 #endif // owner drawn
 {
     wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent"));

+    memset(&m_vMenuData, '\0', sizeof(m_vMenuData));
+    m_vMenuData.id = (USHORT)nId;

 
     Init();
 } // end of wxMenuItem::wxMenuItem
 
     Init();
 } // end of wxMenuItem::wxMenuItem


@@ -234,9 +236,10 @@ wxString wxMenuItemBase::GetLabelFromText(
     return label;
 }
 
     return label;
 }
 

-// radio group stuff
+//
+// Radio group stuff

 // -----------------
 // -----------------

-
+//

 void wxMenuItem::SetAsRadioGroupStart()
 {
     m_bIsRadioGroupStart = TRUE;
 void wxMenuItem::SetAsRadioGroupStart()
 {
     m_bIsRadioGroupStart = TRUE;


@@ -246,19 +249,20 @@ void wxMenuItem::SetRadioGroupStart(
   int                               nStart
 )
 {
   int                               nStart
 )
 {

-    wxASSERT_MSG( !m_bIsRadioGroupStart,
-                  _T("should only be called for the next radio items") );
+    wxASSERT_MSG( !m_bIsRadioGroupStart
+                 ,_T("should only be called for the next radio items")
+                );

 
     m_vRadioGroup.m_nStart = nStart;
 
     m_vRadioGroup.m_nStart = nStart;

-} // end of wxMenuItem::SetRadioGroupStart
+} // wxMenuItem::SetRadioGroupStart

 
 void wxMenuItem::SetRadioGroupEnd(
   int                               nEnd
 )
 {
 
 void wxMenuItem::SetRadioGroupEnd(
   int                               nEnd
 )
 {

-    wxASSERT_MSG( m_bIsRadioGroupStart,
-                  _T("should only be called for the first radio item") );
-
+    wxASSERT_MSG( m_bIsRadioGroupStart
+                 ,_T("should only be called for the first radio item")
+                );

     m_vRadioGroup.m_nEnd = nEnd;
 } // end of wxMenuItem::SetRadioGroupEnd
 
     m_vRadioGroup.m_nEnd = nEnd;
 } // end of wxMenuItem::SetRadioGroupEnd
 


@@ -304,7 +308,7 @@ void wxMenuItem::Check(
 
     HMENU                           hMenu = GetHmenuOf(m_parentMenu);
 
 
     HMENU                           hMenu = GetHmenuOf(m_parentMenu);
 

-    if ( GetKind() == wxITEM_RADIO )
+    if (GetKind() == wxITEM_RADIO)

     {
         //
         // It doesn't make sense to uncheck a radio item - what would this do?
     {
         //
         // It doesn't make sense to uncheck a radio item - what would this do?


@@ -317,23 +321,26 @@ void wxMenuItem::Check(
         //
         const wxMenuItemList&       rItems = m_parentMenu->GetMenuItems();
         int                         nPos = rItems.IndexOf(this);
         //
         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?") );
+        wxCHECK_RET( nPos != wxNOT_FOUND
+                    ,_T("menuitem not found in the menu items list?")
+                   );

 
         //
         // Get the radio group range
         //
 
         //
         // Get the radio group range
         //

+        int                         nStart;
+        int                         nEnd;

 
         if (m_bIsRadioGroupStart)
         {
 
         if (m_bIsRadioGroupStart)
         {

-            // we already have all information we need
+            //
+            // We already have all information we need
+            //

             nStart = nPos;
             nStart = nPos;

-            nEnd = m_vRadioGroup.m_nEnd;
+            nEnd   = m_vRadioGroup.m_nEnd;

         }
         }

-        else // Next radio group item
+        else // next radio group item

         {
             //
             // Get the radio group end from the start item
         {
             //
             // Get the radio group end from the start item


@@ -349,26 +356,22 @@ void wxMenuItem::Check(
 
         for (int n = nStart; n <= nEnd && pNode; n++)
         {
 
         for (int n = nStart; n <= nEnd && pNode; n++)
         {

-            if (n != nPos)
-            {
-                pNode->GetData()->m_isChecked = FALSE;
-            }
-

             if (n == nPos)
             {
             if (n == nPos)
             {

-                bOk = (bool)::WinSendMsg( hMenu
-                                         ,MM_SETITEMATTR
-                                         ,MPFROM2SHORT(n, TRUE)
-                                         ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
-                                        );
+                ::WinSendMsg( hMenu
+                             ,MM_SETITEMATTR
+                             ,MPFROM2SHORT(n, TRUE)
+                             ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
+                            );

             }
             }

-            else
+            if (n != nPos)

             {
             {

-                bOk = (bool)::WinSendMsg( hMenu
-                                         ,MM_SETITEMATTR
-                                         ,MPFROM2SHORT(n, TRUE)
-                                         ,MPFROM2SHORT(MIA_CHECKED, FALSE)
-                                        );
+                pNode->GetData()->m_isChecked = FALSE;
+                ::WinSendMsg( hMenu
+                             ,MM_SETITEMATTR
+                             ,MPFROM2SHORT(n, TRUE)
+                             ,MPFROM2SHORT(MIA_CHECKED, FALSE)
+                            );

             }
             pNode = pNode->GetNext();
         }
             }
             pNode = pNode->GetNext();
         }