X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d65c269b3f665e15a8ae1b8fff063b2ec0ef19a7..884215788fcb7a3364ff6e1494c5da90fb2721bf:/include/wx/gtk/menu.h diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index ee22d137b9..9af8379c5a 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 @@ -74,23 +74,12 @@ 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); + virtual wxMenuItem* DoAppend(wxMenuItem *item); + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); + virtual wxMenuItem* DoRemove(wxMenuItem *item); // TODO: virtual void SetTitle(const wxString& title); - // compatibility only -#if wxUSE_MENU_CALLBACK - wxMenu(const wxString& title, const wxFunction func) - : wxMenuBase(title) - { - Init(); - - Callback(func); - } -#endif // WXWIN_COMPATIBILITY_2 - // implementation int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;