Added samples.inc to DATAFILES in Makefile.in - is that enough?

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index da529a56339e435e30ac8dfec9c6c3e756d7e9d7..03ee6f9b5d3543d25d0093288b258159455e99cf 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -180,17 +180,17 @@ void wxMenuItem::Enable(
     if (m_isEnabled == bEnable)
         return;
     if (bEnable)
     if (m_isEnabled == bEnable)
         return;
     if (bEnable)

-        bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu)
-                           ,MM_SETITEMATTR
-                           ,MPFROM2SHORT(GetRealId(), TRUE)
-                           ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED)
-                          );
+        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                 ,MM_SETITEMATTR
+                                 ,MPFROM2SHORT(GetRealId(), TRUE)
+                                 ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED)
+                                );

     else
     else

-        bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu)
-                           ,MM_SETITEMATTR
-                           ,MPFROM2SHORT(GetRealId(), TRUE)
-                           ,MPFROM2SHORT(MIA_DISABLED, FALSE)
-                          );
+        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                 ,MM_SETITEMATTR
+                                 ,MPFROM2SHORT(GetRealId(), TRUE)
+                                 ,MPFROM2SHORT(MIA_DISABLED, FALSE)
+                                );

     if (!bOk)
     {
         wxLogLastError("EnableMenuItem");
     if (!bOk)
     {
         wxLogLastError("EnableMenuItem");


@@ -208,17 +208,17 @@ void wxMenuItem::Check(
     if (m_isChecked == bCheck)
         return;
     if (bCheck)
     if (m_isChecked == bCheck)
         return;
     if (bCheck)

-        bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu)
-                           ,MM_SETITEMATTR
-                           ,MPFROM2SHORT(GetRealId(), TRUE)
-                           ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
-                          );
+        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                 ,MM_SETITEMATTR
+                                 ,MPFROM2SHORT(GetRealId(), TRUE)
+                                 ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
+                                );

     else
     else

-        bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu)
-                           ,MM_SETITEMATTR
-                           ,MPFROM2SHORT(GetRealId(), TRUE)
-                           ,MPFROM2SHORT(MIA_CHECKED, FALSE)
-                          );
+        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                 ,MM_SETITEMATTR
+                                 ,MPFROM2SHORT(GetRealId(), TRUE)
+                                 ,MPFROM2SHORT(MIA_CHECKED, FALSE)
+                                );

     if (!bOk)
     {
         wxLogLastError("EnableMenuItem");
     if (!bOk)
     {
         wxLogLastError("EnableMenuItem");


@@ -250,7 +250,7 @@ void wxMenuItem::SetText(
     USHORT                          uId = GetRealId();
     MENUITEM                        vItem;
     USHORT                          uFlagsOld;
     USHORT                          uId = GetRealId();
     MENUITEM                        vItem;
     USHORT                          uFlagsOld;

-    
+

     if (!::WinSendMsg( hMenu
                       ,MM_QUERYITEM
                       ,MPFROM2SHORT(uId, TRUE)
     if (!::WinSendMsg( hMenu
                       ,MM_QUERYITEM
                       ,MPFROM2SHORT(uId, TRUE)