always properly check if SeekI() calls succeded; this makes CanRead() functions of...

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 964e64892f867fa8594def0052e922a35f4f0622..cc55d4199646b42483ba76e7fa7aaadbe0810f26 100644 (file)
--- 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()
 {
@@ -170,7 +172,7 @@ void wxMenuItem::Init()
     ResetOwnerDrawn();
 
     //  switch ownerdraw back on if using a non default margin
-    if ( GetId() != wxID_SEPARATOR )
+    if ( !IsSeparator() )
         SetMarginWidth(GetMarginWidth());
 
     // tell the owner drawing code to show the accel string as well
@@ -186,14 +188,14 @@ wxMenuItem::~wxMenuItem()
 // ----
 
 // return the id for calling Win32 API functions
-unsigned wxMenuItem::GetMSWId() const
+WXWPARAM wxMenuItem::GetMSWId() const
 {
     // we must use ids in unsigned short range with Windows functions, if we
     // pass ids > USHRT_MAX to them they get very confused (e.g. start
     // generating WM_COMMAND messages with negative high word of wParam), so
     // use the cast to ensure the id is in range
-    return m_subMenu ? wx_reinterpret_cast(unsigned, m_subMenu->GetHMenu())
-                     : wx_static_cast(unsigned short, GetId());
+    return m_subMenu ? wxPtrToUInt(m_subMenu->GetHMenu())
+                     : static_cast<unsigned short>(GetId());
 }
 
 // get item state
@@ -203,7 +205,7 @@ bool wxMenuItem::IsChecked() const
 {
     // fix that RTTI is always getting the correct state (separators cannot be checked, but the call below
     // returns true
-    if ( GetId() == wxID_SEPARATOR )
+    if ( IsSeparator() )
         return false ;
 
     int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetMSWId(), MF_BYCOMMAND);
@@ -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
 // -----------------