X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9711a4deb97504db860a136df11077fbc56eeee..9f8845289521c7f53e95b6dfd8275daab8b05639:/include/wx/motif/menu.h?ds=sidebyside diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h index e130a1257b..eb26667a36 100644 --- a/include/wx/motif/menu.h +++ b/include/wx/motif/menu.h @@ -12,7 +12,7 @@ #ifndef _WX_MOTIF_MENU_H_ #define _WX_MOTIF_MENU_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "menu.h" #endif @@ -38,9 +38,9 @@ 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); virtual void Break(); @@ -118,6 +118,7 @@ public: wxMenuBar() { Init(); } wxMenuBar(long WXUNUSED(style)) { Init(); } wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); + wxMenuBar(int n, wxMenu *menus[], const wxArrayString& titles); virtual ~wxMenuBar(); // implement base class (pure) virtuals