X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70dc287a3997b65d954bfbd5861f72696bd3dd27..26dddf6c3455f95bef2dcb2a0a514fa0558b50ab:/include/wx/mac/menu.h?ds=sidebyside diff --git a/include/wx/mac/menu.h b/include/wx/mac/menu.h index c401f7f140..9c71c05727 100644 --- a/include/wx/mac/menu.h +++ b/include/wx/mac/menu.h @@ -12,7 +12,7 @@ #ifndef _WX_MENU_H_ #define _WX_MENU_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "menu.h" #endif @@ -123,15 +123,6 @@ public: virtual void SetLabelTop( size_t pos, const wxString& label ); virtual wxString GetLabelTop( size_t pos ) const; - // compatibility: these functions are deprecated -#if WXWIN_COMPATIBILITY - void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } - wxEvtHandler *GetEventHandler() { return m_eventHandler; } - - bool Enabled(int id) const { return IsEnabled(id); } - bool Checked(int id) const { return IsChecked(id); } -#endif // WXWIN_COMPATIBILITY - // implementation from now on WXHMENU Create(); int FindMenu(const wxString& title); @@ -164,10 +155,6 @@ protected: void Init(); wxWindow *m_invokingWindow; -#if WXWIN_COMPATIBILITY - wxEvtHandler *m_eventHandler; -#endif // WXWIN_COMPATIBILITY - wxArrayString m_titles; private: