X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9add93670bb4a38e4007b8422b34b29b6194eecb..27b2dd53f629a78266c51d1b0b5db918401dcd4f:/include/wx/gtk/menu.h diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 9af8379c5a..a154a64e21 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -46,10 +46,11 @@ public: void UnsetInvokingWindow( wxWindow *win ); // common part of Append and Insert - bool GtkAppend(wxMenu *menu, const wxString& title); + bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1); +#ifndef __WXGTK20__ GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; +#endif GtkWidget *m_menubar; long m_style; wxWindow *m_invokingWindow; @@ -87,18 +88,15 @@ public: GtkWidget *m_menu; // GtkMenu GtkWidget *m_owner; GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; private: // common code for all constructors: void Init(); - // common part of Append and Insert - bool GtkAppend(wxMenuItem *item); + // common part of Append (if pos == -1) and Insert + bool GtkAppend(wxMenuItem *item, int pos=-1); - // 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) };