X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/717a57c2fabb054c8f00dc5dae70df1d03cfe532..4c7852186d48a5b8f406462c2c3fa020f0a052bb:/include/wx/gtk/menu.h?ds=sidebyside diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 07f1575111..f36c816d2a 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -45,6 +45,9 @@ public: void SetInvokingWindow( wxWindow *win ); void UnsetInvokingWindow( wxWindow *win ); + // common part of Append and Insert + bool GtkAppend(wxMenu *menu, const wxString& title); + GtkAccelGroup *m_accel; GtkItemFactory *m_factory; GtkWidget *m_menubar; @@ -77,13 +80,16 @@ public: // TODO: virtual void SetTitle(const wxString& title); -#ifdef WXWIN_COMPATIBILITY + // compatibility only +#if wxUSE_MENU_CALLBACK wxMenu(const wxString& title, const wxFunction func) : wxMenuBase(title) { + Init(); + Callback(func); } -#endif // WXWIN_COMPATIBILITY +#endif // WXWIN_COMPATIBILITY_2 // implementation int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; @@ -98,6 +104,9 @@ private: // common code for all constructors: void Init(); + // common part of Append and Insert + bool GtkAppend(wxMenuItem *item); + DECLARE_DYNAMIC_CLASS(wxMenu) };