X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a539480fb18ad17e1d4bacdaca414b255b417c1..159b66c02a8f1c724d1af3c768ad5d90f4c8a0e2:/include/wx/msw/menu.h?ds=sidebyside diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index 741b88aa6e..29472ce14c 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -60,9 +60,6 @@ public: } #endif // wxUSE_MENU_CALLBACK - // MSW-specific - bool ProcessCommand(wxCommandEvent& event); - // implementation only from now on // ------------------------------- @@ -74,10 +71,6 @@ public: // get the menu handle WXHMENU GetHMenu() const { return m_hMenu; } - // attach/detach menu to/from wxMenuBar - void Attach(wxMenuBar *menubar); - void Detach(); - #if wxUSE_ACCEL // called by wxMenuBar to build its accel table from the accels of all menus bool HasAccels() const { return !m_accels.IsEmpty(); } @@ -134,10 +127,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 SetLabelTop( size_t pos, const wxString& label ); virtual wxString GetLabelTop( size_t pos ) const; @@ -153,15 +142,8 @@ public: // implementation from now on WXHMENU Create(); - int FindMenu(const wxString& title); - void Detach(); - - // returns TRUE if we're attached to a frame - bool IsAttached() const { return m_menuBarFrame != NULL; } - // get the frame we live in - wxFrame *GetFrame() const { return m_menuBarFrame; } - // attach to a frame - void Attach(wxFrame *frame); + virtual void Detach(); + virtual void Attach(wxFrame *frame); #if wxUSE_ACCEL // get the accel table for all the menus @@ -188,7 +170,6 @@ protected: wxArrayString m_titles; - wxFrame *m_menuBarFrame; WXHMENU m_hMenu; #if wxUSE_ACCEL