X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d9713540dd22f7e81a7c11a68249f5ed35c87bd..72e4e6a397fd04e6d8e0cc5ae22aaba740c3c8bc:/include/wx/gtk1/menu.h diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index 123f23b86b..dcdba21d72 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -18,13 +18,13 @@ // wxMenuBar //----------------------------------------------------------------------------- -class wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { 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,7 +46,7 @@ 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; @@ -56,6 +56,8 @@ public: wxWindow *m_invokingWindow; private: + void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); + DECLARE_DYNAMIC_CLASS(wxMenuBar) }; @@ -63,7 +65,7 @@ private: // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -93,8 +95,8 @@ 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); GtkWidget *m_prevRadio;