X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4224f059750329cc68964eeb7b2633206e245e0d..0ba6a836246ee6768c29d50adfe9fee30221da8e:/src/mac/classic/menu.cpp diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp index c7a1407ab4..ab63be2f36 100644 --- a/src/mac/classic/menu.cpp +++ b/src/mac/classic/menu.cpp @@ -9,16 +9,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "menu.h" -#pragma implementation "menuitem.h" -#endif - // ============================================================================ // headers & declarations // ============================================================================ -// wxWindows headers +// wxWidgets headers // ----------------- #include "wx/app.h" @@ -35,10 +30,8 @@ // ---------------------- #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // the (popup) menu title has this special id static const int idMenuTitle = -2; @@ -463,13 +456,13 @@ wxMenuBar::wxMenuBar( long WXUNUSED(style) ) } -wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[]) +wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED(style)) { Init(); m_titles.Alloc(count); - for ( int i = 0; i < count; i++ ) + for ( size_t i = 0; i < count; i++ ) { m_menus.Append(menus[i]); m_titles.Add(titles[i]);