X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa7134b05abb0d8df4b800762aa9d040bfd689a4..d8812c6e0e780fb2dae99bc352c5061f58793e14:/src/msw/menuitem.cpp?ds=sidebyside

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index d5ef1dc4e7..cc55d41996 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -137,6 +137,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
     Init();
 }
 
+#if WXWIN_COMPATIBILITY_2_8
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,
@@ -151,6 +152,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
 {
     Init();
 }
+#endif
 
 void wxMenuItem::Init()
 {
@@ -193,7 +195,7 @@ WXWPARAM wxMenuItem::GetMSWId() const
     // generating WM_COMMAND messages with negative high word of wParam), so
     // use the cast to ensure the id is in range
     return m_subMenu ? wxPtrToUInt(m_subMenu->GetHMenu())
-                     : wx_static_cast(unsigned short, GetId());
+                     : static_cast<unsigned short>(GetId());
 }
 
 // get item state
@@ -211,12 +213,6 @@ bool wxMenuItem::IsChecked() const
     return (flag & MF_CHECKED) != 0;
 }
 
-/* static */
-wxString wxMenuItemBase::GetLabelText(const wxString& text)
-{
-    return wxStripMenuCodes(text);
-}
-
 // radio group stuff
 // -----------------