Use new menu item function

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 27302245d36cc214cc83f0ceaf63958dea3251c5..193a679348df0e0fa44aff4b27ff0dff7e314989 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        menuitem.cpp
+// Name:        src/os2/menuitem.cpp

 // Purpose:     wxMenuItem implementation
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxMenuItem implementation
 // Author:      David Webster
 // Modified by:


@@ -16,20 +16,20 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/menuitem.h"
+#include "wx/stockitem.h"
+

 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"

-    #include "wx/font.h"

     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/string.h"
     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/menuitem.h"
-#include "wx/log.h"
-

 #if wxUSE_ACCEL
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL
 #if wxUSE_ACCEL
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL


@@ -180,7 +180,7 @@ bool wxMenuItem::IsChecked() const
     return (uFlag & MIA_CHECKED) == MIA_CHECKED ;
 } // end of wxMenuItem::IsChecked
 
     return (uFlag & MIA_CHECKED) == MIA_CHECKED ;
 } // end of wxMenuItem::IsChecked
 

-wxString wxMenuItemBase::GetLabelFromText(
+wxString wxMenuItemBase::GetLabelText(

   const wxString&                   rsText
 )
 {
   const wxString&                   rsText
 )
 {


@@ -199,7 +199,7 @@ wxString wxMenuItemBase::GetLabelFromText(
         sLabel += *zPc;
     }
     return sLabel;
         sLabel += *zPc;
     }
     return sLabel;

-} // end of wxMenuItemBase::GetLabelFromText
+} // end of wxMenuItemBase::GetLabelText

 
 //
 // Radio group stuff
 
 //
 // Radio group stuff


@@ -363,7 +363,7 @@ void wxMenuItem::Check(
     wxMenuItemBase::Check(bCheck);
 } // end of wxMenuItem::Check
 
     wxMenuItemBase::Check(bCheck);
 } // end of wxMenuItem::Check
 

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

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


@@ -373,10 +373,18 @@ void wxMenuItem::SetText( const wxString& rText )
     if (m_text == sText)
         return;
 
     if (m_text == sText)
         return;
 

-    wxMenuItemBase::SetText(sText);
-    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(sText));
+    // wxMenuItemBase will do stock ID checks
+    wxMenuItemBase::SetItemLabel(sText);
+
+    // m_text could now be different from 'text' if we are a stock menu item,
+    // so use only m_text below
+
+    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(m_text));

 #if  wxUSE_OWNER_DRAWN
 #if  wxUSE_OWNER_DRAWN

-    SetAccelString(rText.AfterFirst(_T('\t')));
+    if (rText.IsEmpty())
+        SetAccelString(m_text.AfterFirst(_T('\t')));
+    else
+        SetAccelString(rText.AfterFirst(_T('\t')));

 #endif // wxUSE_OWNER_DRAWN
 
     HWND                            hMenu = GetHmenuOf(m_parentMenu);
 #endif // wxUSE_OWNER_DRAWN
 
     HWND                            hMenu = GetHmenuOf(m_parentMenu);


@@ -407,19 +415,19 @@ void wxMenuItem::SetText( const wxString& rText )
             uFlagsOld |= MIS_SUBMENU;
         }
 
             uFlagsOld |= MIS_SUBMENU;
         }
 

-        BYTE*                       pData;
+        char*                       pData;

 
 #if wxUSE_OWNER_DRAWN
         if (IsOwnerDrawn())
         {
             uFlagsOld |= MIS_OWNERDRAW;
 
 #if wxUSE_OWNER_DRAWN
         if (IsOwnerDrawn())
         {
             uFlagsOld |= MIS_OWNERDRAW;

-            pData = (BYTE*)this;
+            pData = (char*)this;

         }
         else
 #endif  //owner drawn
         {
             uFlagsOld |= MIS_TEXT;
         }
         else
 #endif  //owner drawn
         {
             uFlagsOld |= MIS_TEXT;

-            pData = (BYTE*)sText.c_str();
+            pData = (char*) m_text.wx_str();

         }
 
         //
         }
 
         //