X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9add93670bb4a38e4007b8422b34b29b6194eecb..413baa20a1d96d2e886bffc0b06ff97f6d8c472b:/include/wx/gtk/menu.h

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 9af8379c5a..e28b4477e7 100644
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -24,7 +24,7 @@ public:
     // ctors
     wxMenuBar();
     wxMenuBar(long style);
-    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
     virtual ~wxMenuBar();
 
     // implement base class (pure) virtuals
@@ -46,15 +46,18 @@ 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;
 
 private:
+    void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
+
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 };
 
@@ -87,18 +90,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)
 };