react to the year being changed in the spin control text zone and not only with the...

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index b54fd5783c8329d79c117e38cb2d4d269c47ee20..574fea6166f10423b0d1eb047f3dc69c5cfb13e9 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -115,7 +115,7 @@ wxMenuItem::wxMenuItem(
 )
 : wxMenuItemBase( pParentMenu
                  ,nId
 )
 : wxMenuItemBase( pParentMenu
                  ,nId

-                 ,rsText
+                 ,TextToLabel(rsText)

                  ,rsHelp
                  ,eKind
                  ,pSubMenu
                  ,rsHelp
                  ,eKind
                  ,pSubMenu


@@ -141,7 +141,7 @@ wxMenuItem::wxMenuItem(
 )
 : wxMenuItemBase( pParentMenu
                  ,nId
 )
 : wxMenuItemBase( pParentMenu
                  ,nId

-                 ,rsText
+                 ,TextToLabel(rsText)

                  ,rsHelp
                  ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL
                  ,pSubMenu
                  ,rsHelp
                  ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL
                  ,pSubMenu


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


@@ -302,9 +306,9 @@ void wxMenuItem::Check(
     if (m_isChecked == bCheck)
         return;
 
     if (m_isChecked == bCheck)
         return;
 

-    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();
         }


@@ -376,13 +379,13 @@ void wxMenuItem::Check(
     else // check item
     {
         if (bCheck)
     else // check item
     {
         if (bCheck)

-            bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+            bOk = (bool)::WinSendMsg( hMenu

                                      ,MM_SETITEMATTR
                                      ,MPFROM2SHORT(GetRealId(), TRUE)
                                      ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
                                     );
         else
                                      ,MM_SETITEMATTR
                                      ,MPFROM2SHORT(GetRealId(), TRUE)
                                      ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
                                     );
         else

-            bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+            bOk = (bool)::WinSendMsg( hMenu

                                      ,MM_SETITEMATTR
                                      ,MPFROM2SHORT(GetRealId(), TRUE)
                                      ,MPFROM2SHORT(MIA_CHECKED, FALSE)
                                      ,MM_SETITEMATTR
                                      ,MPFROM2SHORT(GetRealId(), TRUE)
                                      ,MPFROM2SHORT(MIA_CHECKED, FALSE)


@@ -403,14 +406,14 @@ void wxMenuItem::SetText(
     // Don't do anything if label didn't change
     //
 
     // Don't do anything if label didn't change
     //
 

-    wxString Text = TextToLabel(rText);
-    if (m_text == Text)
+    wxString                        sText = TextToLabel(rText);
+    if (m_text == sText)

         return;
 
         return;
 

-    wxMenuItemBase::SetText(Text);
-    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(Text));
+    wxMenuItemBase::SetText(sText);
+    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(sText));

 
 

-    HWND                            hMenu = GetHMenuOf(m_parentMenu);
+    HWND                            hMenu = GetHmenuOf(m_parentMenu);

 
     wxCHECK_RET(hMenu, wxT("menuitem without menu"));
 
 
     wxCHECK_RET(hMenu, wxT("menuitem without menu"));
 


@@ -450,7 +453,7 @@ void wxMenuItem::SetText(
 #endif  //owner drawn
         {
             uFlagsOld |= MIS_TEXT;
 #endif  //owner drawn
         {
             uFlagsOld |= MIS_TEXT;

-            pData = (BYTE*)Text.c_str();
+            pData = (BYTE*)sText.c_str();

         }
 
         //
         }
 
         //