X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22e90769f8da73d398bd7da83f185263a292972f..349efbaa89b499557d9a26320bcbd9b012aac9d2:/include/wx/os2/menuitem.h?ds=sidebyside diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h index 1d6b8879fe..33a41cef62 100644 --- 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 - ,int nId = ID_SEPARATOR + ,int nId = wxID_SEPARATOR ,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; -#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(); } @@ -73,6 +69,11 @@ public: // 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