X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1987af7e9f5685198b0c19e2326eebf7e56b7834..be7a101366995b7b7bb76e3d5b1e7dd8fc9a1af8:/include/wx/gtk/menu.h diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 13d2f6b343..afc85c0a0c 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -10,7 +10,7 @@ #ifndef __GTKMENUH__ #define __GTKMENUH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "menu.h" #endif @@ -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); -#if 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,13 @@ private: // common code for all constructors: void Init(); + // common part of Append and Insert + bool GtkAppend(wxMenuItem *item); + + // if the last menu item was a radio one, this field contains its path, + // otherwise it is empty + wxString m_pathLastRadio; + DECLARE_DYNAMIC_CLASS(wxMenu) };