Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h...

[wxWidgets.git] / src / mac / classic / menu.cpp

diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp
index 57dfedd102fd3e3b4497855b80e98296a86dbe65..ab63be2f36536057ca2fa52932e7f3a6f3dcc805 100644 (file)
--- a/src/mac/classic/menu.cpp
+++ b/src/mac/classic/menu.cpp
@@ -9,11 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "menu.h"
-#pragma implementation "menuitem.h"
-#endif
-

 // ============================================================================
 // headers & declarations
 // ============================================================================
 // ============================================================================
 // headers & declarations
 // ============================================================================


@@ -35,10 +30,8 @@
 // ----------------------
 #include <string.h>
 
 // ----------------------
 #include <string.h>
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)

-#endif

 
 // the (popup) menu title has this special id
 static const int idMenuTitle = -2;
 
 // the (popup) menu title has this special id
 static const int idMenuTitle = -2;


@@ -469,7 +462,7 @@ wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], lon
 
     m_titles.Alloc(count);
 
 
     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]);
     {
         m_menus.Append(menus[i]);
         m_titles.Add(titles[i]);