added wx/defs.h include to correct compilation issues under Mac OS X

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index af97aab35a6613c776d1a4536afaa0c79e7e2052..16ea72e6a0f97ea21fd68ecdfa52d37191c7ba0c 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -71,7 +71,7 @@ static wxString TextToLabel(const wxString& rTitle)
                 pc++;
                 Title << wxT('&');
             }
                 pc++;
                 Title << wxT('&');
             }

-            else 
+            else

                 Title << wxT('~');
         }
 //         else if (*pc == wxT('/'))
                 Title << wxT('~');
         }
 //         else if (*pc == wxT('/'))


@@ -155,6 +155,8 @@ wxMenuItem::wxMenuItem(
     m_text        = TextToLabel(rText);
     m_isCheckable = bCheckable;
     m_help        = rStrHelp;
     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
 
 wxMenuItem::~wxMenuItem()
 } // end of wxMenuItem::wxMenuItem
 
 wxMenuItem::~wxMenuItem()


@@ -206,18 +208,6 @@ wxString wxMenuItemBase::GetLabelFromText(
     return label;
 }
 
     return label;
 }
 

-// accelerators
-// ------------
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
-{
-    return wxGetAccelFromString(GetText());
-}
-
-#endif // wxUSE_ACCEL
-

 // change item state
 // -----------------
 
 // change item state
 // -----------------
 


@@ -233,13 +223,13 @@ void wxMenuItem::Enable(
         bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
                                  ,MM_SETITEMATTR
                                  ,MPFROM2SHORT(GetRealId(), TRUE)
         bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
                                  ,MM_SETITEMATTR
                                  ,MPFROM2SHORT(GetRealId(), TRUE)

-                                 ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED)
+                                 ,MPFROM2SHORT(MIA_DISABLED, FALSE)

                                 );
     else
         bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
                                  ,MM_SETITEMATTR
                                  ,MPFROM2SHORT(GetRealId(), TRUE)
                                 );
     else
         bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
                                  ,MM_SETITEMATTR
                                  ,MPFROM2SHORT(GetRealId(), TRUE)

-                                 ,MPFROM2SHORT(MIA_DISABLED, FALSE)
+                                 ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED)

                                 );
     if (!bOk)
     {
                                 );
     if (!bOk)
     {


@@ -271,7 +261,7 @@ void wxMenuItem::Check(
                                 );
     if (!bOk)
     {
                                 );
     if (!bOk)
     {

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

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