X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a539480fb18ad17e1d4bacdaca414b255b417c1..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/menu.h diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index caa919c05d..afc85c0a0c 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -10,7 +10,7 @@ #ifndef __GTKMENUH__ #define __GTKMENUH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "menu.h" #endif @@ -80,6 +80,8 @@ public: // TODO: virtual void SetTitle(const wxString& title); + // compatibility only +#if wxUSE_MENU_CALLBACK wxMenu(const wxString& title, const wxFunction func) : wxMenuBase(title) { @@ -87,6 +89,7 @@ public: Callback(func); } +#endif // WXWIN_COMPATIBILITY_2 // implementation int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; @@ -104,6 +107,10 @@ private: // 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) };