X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..26dddf6c3455f95bef2dcb2a0a514fa0558b50ab:/include/wx/menu.h diff --git a/include/wx/menu.h b/include/wx/menu.h index ba839faa69..f3e34bd3f8 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -330,16 +330,6 @@ public: Insert(0u, itemid, text, help, isCheckable); } -#if WXWIN_COMPATIBILITY - bool Enabled(int itemid) const { return IsEnabled(itemid); } - bool Checked(int itemid) const { return IsChecked(itemid); } - - wxMenuItem* FindItemForId(int itemId, wxMenu **itemMenu) const - { return FindItem(itemId, itemMenu); } - - wxList& GetItems() const { return (wxList &)m_items; } -#endif // WXWIN_COMPATIBILITY - protected: // virtuals to override in derived classes // --------------------------------------- @@ -482,18 +472,6 @@ public: // don't want menu bars to accept the focus by tabbing to them virtual bool AcceptsFocusFromKeyboard() const { return FALSE; } - // compatibility only: these functions are deprecated, use the new ones - // instead -#if WXWIN_COMPATIBILITY - bool Enabled(int itemid) const { return IsEnabled(itemid); } - bool Checked(int itemid) const { return IsChecked(itemid); } - - wxMenuItem* FindMenuItemById(int itemid) const - { return FindItem(itemid); } - wxMenuItem* FindItemForId(int itemid, wxMenu **menu = NULL) const - { return FindItem(itemid, menu); } -#endif // WXWIN_COMPATIBILITY - protected: // the list of all our menus wxMenuList m_menus;