X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70dc287a3997b65d954bfbd5861f72696bd3dd27..fb4888a650065c9a24572d6867345f34adafaa37:/include/wx/os2/menu.h diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h index af32bd3d30..0505afc347 100644 --- a/include/wx/os2/menu.h +++ b/include/wx/os2/menu.h @@ -55,8 +55,8 @@ public: // // Implement base class virtuals // - virtual bool DoAppend(wxMenuItem* pItem); - virtual bool DoInsert( size_t nPos + virtual wxMenuItem* DoAppend(wxMenuItem* pItem); + virtual wxMenuItem* DoInsert( size_t nPos ,wxMenuItem* pItem ); virtual wxMenuItem* DoRemove(wxMenuItem* pItem); @@ -194,6 +194,7 @@ public: wxMenuBar( int n ,wxMenu* vMenus[] ,const wxString sTitles[] + ,long lStyle = 0 ); virtual ~wxMenuBar(); @@ -230,16 +231,6 @@ public: ); virtual wxString GetLabelTop(size_t nPos) const; - // - // Compatibility: these functions are deprecated - // -#if WXWIN_COMPATIBILITY - void SetEventHandler(wxEvtHandler* pHandler) { m_pEventHandler = pHandler; } - wxEvtHandler* GetEventHandler(void) { return m_pEventHandler; } - bool Enabled(int nId) const { return IsEnabled(nId); } - bool Checked(int nId) const { return IsChecked(nId); } -#endif // WXWIN_COMPATIBILITY - // // Implementation from now on // @@ -275,10 +266,6 @@ protected: // void Init(void); -#if WXWIN_COMPATIBILITY - wxEvtHandler* m_pEventHandler; -#endif // WXWIN_COMPATIBILITY - wxArrayString m_titles; WXHMENU m_hMenu;