Compilation fixes for wxUSE_STL=1 and for

WXWIN_COMPATIBILITY_2_4=0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 3acc1811a900be66b23c3d931be0f93f0dc3c398..5e2fa12938ee98bb4b8d9535773fa0432e8733c3 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -29,6 +29,8 @@ class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 #endif
 
+#include "wx/arrstr.h"
+
 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 15825ddc9603cb34e73d607a083744f469e14ced..988d7bcf874805910b879168be7a8cd4fec8cd5a 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -191,7 +191,7 @@ wxSize wxWizardSizer::GetMaxChildSize()
 #endif
 
     wxSize maxOfMin;
-    wxSizerItemList::Node *childNode;
+    wxSizerItemList::compatibility_iterator childNode;
 
     for(childNode = m_children.GetFirst(); childNode;
         childNode = childNode->GetNext())