X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f7c5199ed9bc29507d426b13db9346bf1860005..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/univ/menu.h diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h index 4f1c1c888e..874f5bd896 100644 --- a/include/wx/univ/menu.h +++ b/include/wx/univ/menu.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_MENU_H_ #define _WX_UNIV_MENU_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univmenu.h" #endif @@ -24,7 +24,7 @@ // fwd declarations class WXDLLEXPORT wxMenuInfo; -WX_DECLARE_OBJARRAY(wxMenuInfo, wxMenuInfoArray); +WX_DECLARE_EXPORTED_OBJARRAY(wxMenuInfo, wxMenuInfoArray); class WXDLLEXPORT wxMenuGeometryInfo; class WXDLLEXPORT wxPopupMenuWindow; @@ -79,9 +79,9 @@ public: protected: // 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); // common part of DoAppend and DoInsert void OnItemAdded(wxMenuItem *item);