safer definitions for wx(U)Int32,16 (taken from intl.cpp)

[wxWidgets.git] / include / wx / os2 / menuitem.h

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 1d6b8879fe9dd521d5ec2f0fd16df5ddbd76f25e..33a41cef6216da15c0c1f60ad4ba0224c6067198 100644 (file)
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -44,7 +44,7 @@ class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
 public:
     // ctor & dtor
     wxMenuItem( wxMenu*         pParentMenu = NULL
 public:
     // ctor & dtor
     wxMenuItem( wxMenu*         pParentMenu = NULL

-               ,int             nId = ID_SEPARATOR
+               ,int             nId = wxID_SEPARATOR

                ,const wxString& rStrName = ""
                ,const wxString& rWxHelp = ""
                ,bool            bCheckable = FALSE
                ,const wxString& rStrName = ""
                ,const wxString& rWxHelp = ""
                ,bool            bCheckable = FALSE


@@ -60,10 +60,6 @@ public:
     virtual void Check(bool bDoCheck = TRUE);
     virtual bool IsChecked(void) const;
 
     virtual void Check(bool bDoCheck = TRUE);
     virtual bool IsChecked(void) const;
 

-#if wxUSE_ACCEL
-    virtual wxAcceleratorEntry* GetAccel(void) const;
-#endif // wxUSE_ACCEL
-

     // unfortunately needed to resolve ambiguity between
     // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
     bool IsCheckable(void) const { return wxMenuItemBase::IsCheckable(); }
     // unfortunately needed to resolve ambiguity between
     // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
     bool IsCheckable(void) const { return wxMenuItemBase::IsCheckable(); }


@@ -73,6 +69,11 @@ public:
     // menu handle depending on what we're
     int GetRealId(void) const;
 
     // menu handle depending on what we're
     int GetRealId(void) const;
 

+    //
+    // All OS/2PM Submenus and menus have one of these
+    //
+    MENUITEM                        m_vMenuData;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 }; // end of CLASS wxMenuItem
 private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 }; // end of CLASS wxMenuItem