X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ab6adfedf92aa4457821422e77c19b80f10bee..b6fa290b5a077a97ec79496972302bccd567bf73:/include/wx/gtk/menu.h?ds=sidebyside diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index c9d198017e..f482d01644 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(NO_GCC_PRAGMA) #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,12 +80,6 @@ public: // TODO: virtual void SetTitle(const wxString& title); - wxMenu(const wxString& title, const wxFunction func) - : wxMenuBase(title) - { - Callback(func); - } - // implementation int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; @@ -96,6 +93,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) };