X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ab6adfedf92aa4457821422e77c19b80f10bee..a9e8bf2dd9bccb38eb39fba955125aaf23d6f500:/include/wx/gtk/menu.h diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index c9d198017e..c72c8ff60d 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -10,21 +10,17 @@ #ifndef __GTKMENUH__ #define __GTKMENUH__ -#ifdef __GNUG__ - #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 @@ -45,13 +41,16 @@ public: void SetInvokingWindow( wxWindow *win ); void UnsetInvokingWindow( wxWindow *win ); - GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; + // common part of Append and Insert + bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1); + 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) }; @@ -59,7 +58,7 @@ private: // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -70,19 +69,8 @@ public: virtual ~wxMenu(); - // implement base class virtuals - virtual bool DoAppend(wxMenuItem *item); - virtual bool DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem *DoRemove(wxMenuItem *item); - // TODO: virtual void SetTitle(const wxString& title); - wxMenu(const wxString& title, const wxFunction func) - : wxMenuBase(title) - { - Callback(func); - } - // implementation int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; @@ -90,12 +78,21 @@ 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 (if pos == -1) and Insert + bool GtkAppend(wxMenuItem *item, int pos=-1); + + GtkWidget *m_prevRadio; + DECLARE_DYNAMIC_CLASS(wxMenu) };