wxControl::SetLabel no longer strips out codes so do it here

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 6b9a515788f3f0c23b3699b079999640cd171b8d..27302245d36cc214cc83f0ceaf63958dea3251c5 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -13,10 +13,6 @@
 // headers & declarations
 // ============================================================================
 
 // headers & declarations
 // ============================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "menuitem.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -175,13 +171,13 @@ int wxMenuItem::GetRealId() const
 // --------------
 bool wxMenuItem::IsChecked() const
 {
 // --------------
 bool wxMenuItem::IsChecked() const
 {

-    USHORT                          uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu)
-                                                                      ,MM_QUERYITEMATTR
-                                                                      ,MPFROM2SHORT(GetId(), TRUE)
-                                                                      ,MPFROMSHORT(MIA_CHECKED)
-                                                                     ));
+    USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                             ,MM_QUERYITEMATTR
+                                             ,MPFROM2SHORT(GetId(), TRUE)
+                                             ,MPFROMSHORT(MIA_CHECKED)
+                                            ));

 
 

-    return (uFlag & MIA_CHECKED);
+    return (uFlag & MIA_CHECKED) == MIA_CHECKED ;

 } // end of wxMenuItem::IsChecked
 
 wxString wxMenuItemBase::GetLabelFromText(
 } // end of wxMenuItem::IsChecked
 
 wxString wxMenuItemBase::GetLabelFromText(


@@ -211,7 +207,7 @@ wxString wxMenuItemBase::GetLabelFromText(
 //
 void wxMenuItem::SetAsRadioGroupStart()
 {
 //
 void wxMenuItem::SetAsRadioGroupStart()
 {

-    m_bIsRadioGroupStart = TRUE;
+    m_bIsRadioGroupStart = true;

 } // end of wxMenuItem::SetAsRadioGroupStart
 
 void wxMenuItem::SetRadioGroupStart(
 } // end of wxMenuItem::SetAsRadioGroupStart
 
 void wxMenuItem::SetRadioGroupStart(


@@ -260,7 +256,7 @@ void wxMenuItem::Enable(
                                 );
     if (!bOk)
     {
                                 );
     if (!bOk)
     {

-        wxLogLastError("EnableMenuItem");
+        wxLogLastError(wxT("EnableMenuItem"));

     }
     wxMenuItemBase::Enable(bEnable);
 } // end of wxMenuItem::Enable
     }
     wxMenuItemBase::Enable(bEnable);
 } // end of wxMenuItem::Enable


@@ -362,14 +358,12 @@ void wxMenuItem::Check(
     }
     if (!bOk)
     {
     }
     if (!bOk)
     {

-        wxLogLastError("CheckMenuItem");
+        wxLogLastError(wxT("CheckMenuItem"));

     }
     wxMenuItemBase::Check(bCheck);
 } // end of wxMenuItem::Check
 
     }
     wxMenuItemBase::Check(bCheck);
 } // end of wxMenuItem::Check
 

-void wxMenuItem::SetText(
-  const wxString&                   rText
-)
+void wxMenuItem::SetText( const wxString& rText )

 {
     //
     // Don't do anything if label didn't change
 {
     //
     // Don't do anything if label didn't change


@@ -393,9 +387,9 @@ void wxMenuItem::SetText(
     m_parentMenu->UpdateAccel(this);
 #endif // wxUSE_ACCEL
 
     m_parentMenu->UpdateAccel(this);
 #endif // wxUSE_ACCEL
 

-    USHORT                          uId = GetRealId();
-    MENUITEM                        vItem;
-    USHORT                          uFlagsOld;
+    USHORT   uId = (USHORT)GetRealId();
+    MENUITEM vItem;
+    USHORT   uFlagsOld;

 
     if (!::WinSendMsg( hMenu
                       ,MM_QUERYITEM
 
     if (!::WinSendMsg( hMenu
                       ,MM_QUERYITEM


@@ -403,7 +397,7 @@ void wxMenuItem::SetText(
                       ,(MPARAM)&vItem
                      ))
     {
                       ,(MPARAM)&vItem
                      ))
     {

-        wxLogLastError("GetMenuState");
+        wxLogLastError(wxT("GetMenuState"));

     }
     else
     {
     }
     else
     {


@@ -483,4 +477,3 @@ wxMenuItem* wxMenuItemBase::New(
                           ,pSubMenu
                          );
 } // end of wxMenuItemBase::New
                           ,pSubMenu
                          );
 } // end of wxMenuItemBase::New

-