X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e6efd1fd2f6cedda23140aff17f56b26ef7c2d2..d0260bd894ec5ef95c960e45cdaff3e6ebae019d:/include/wx/osx/menu.h?ds=sidebyside diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h index 56bbe5789c..55796749a1 100644 --- a/include/wx/osx/menu.h +++ b/include/wx/osx/menu.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.h +// Name: wx/osx/menu.h // Purpose: wxMenu, wxMenuBar classes // Author: Stefan Csomor // Modified by: @@ -41,10 +41,6 @@ public: bool ProcessCommand(wxCommandEvent& event); - // semi-private accessors - - // get the window which contains this menu - wxWindow *GetWindow() const; // get the menu handle WXHMENU GetHMenu() const ; @@ -130,10 +126,6 @@ public: virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); virtual wxMenu *Remove(size_t pos); - virtual int FindMenuItem(const wxString& menuString, - const wxString& itemString) const; - virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; - virtual void EnableTop( size_t pos, bool flag ); virtual void SetMenuLabel( size_t pos, const wxString& label ); virtual wxString GetMenuLabel( size_t pos ) const; @@ -145,7 +137,6 @@ public: } // implementation from now on - int FindMenu(const wxString& title); void Detach(); // returns TRUE if we're attached to a frame @@ -155,12 +146,6 @@ public: // attach to a frame void Attach(wxFrame *frame); - // clear the invoking window for all menus and submenus - void UnsetInvokingWindow() ; - - // set the invoking window for all menus and submenus - void SetInvokingWindow( wxFrame* frame ) ; - // if the menubar is modified, the display is not updated automatically, // call this function to update it (m_menuBarFrame should be !NULL) void Refresh(bool eraseBackground = true, const wxRect *rect = NULL); @@ -178,9 +163,7 @@ public: protected: // common part of all ctors void Init(); - wxWindow *m_invokingWindow; - wxArrayString m_titles; static bool s_macAutoWindowMenu ; static WXHMENU s_macWindowMenuHandle ;