X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..a9e8bf2dd9bccb38eb39fba955125aaf23d6f500:/include/wx/gtk/menu.h diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 9a2d3a80f9..c72c8ff60d 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -44,9 +44,6 @@ public: // common part of Append and Insert bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1); -#ifndef __WXGTK20__ - GtkAccelGroup *m_accel; -#endif GtkWidget *m_menubar; long m_style; wxWindow *m_invokingWindow; @@ -72,11 +69,6 @@ public: virtual ~wxMenu(); - // implement base class virtuals - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem* DoRemove(wxMenuItem *item); - // TODO: virtual void SetTitle(const wxString& title); // implementation @@ -87,6 +79,11 @@ public: GtkWidget *m_owner; GtkAccelGroup *m_accel; +protected: + virtual wxMenuItem* DoAppend(wxMenuItem *item); + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); + virtual wxMenuItem* DoRemove(wxMenuItem *item); + private: // common code for all constructors: void Init();