X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9add93670bb4a38e4007b8422b34b29b6194eecb..9a63feff3a93d9d9dc36f155d3a5c3a36cb922f0:/include/wx/gtk1/menu.h diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index 9af8379c5a..123f23b86b 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -48,8 +48,9 @@ public: // common part of Append and Insert bool GtkAppend(wxMenu *menu, const wxString& title); +#ifndef __WXGTK20__ GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; +#endif GtkWidget *m_menubar; long m_style; wxWindow *m_invokingWindow; @@ -87,7 +88,6 @@ public: GtkWidget *m_menu; // GtkMenu GtkWidget *m_owner; GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; private: // common code for all constructors: @@ -96,9 +96,7 @@ private: // common part of Append and Insert bool GtkAppend(wxMenuItem *item); - // if the last menu item was a radio one, this field contains its path, - // otherwise it is empty - wxString m_pathLastRadio; + GtkWidget *m_prevRadio; DECLARE_DYNAMIC_CLASS(wxMenu) };