X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9add93670bb4a38e4007b8422b34b29b6194eecb..f65bb0f8ab88e80a367b6fa361e92545c04f6914:/include/wx/gtk/menu.h diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 9af8379c5a..c72c8ff60d 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -10,21 +10,17 @@ #ifndef __GTKMENUH__ #define __GTKMENUH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "menu.h" -#endif - //----------------------------------------------------------------------------- // 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,15 +42,15 @@ 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); - GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; 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) }; @@ -62,7 +58,7 @@ private: // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -73,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,18 +78,20 @@ public: GtkWidget *m_menu; // GtkMenu GtkWidget *m_owner; GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; + +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(); - // 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) };