From 69b9f4cca4e56dbd4b2e6d25d1374ae9f4abc2e7 Mon Sep 17 00:00:00 2001
From: Mattia Barbon <mbarbon@cpan.org>
Date: Sat, 19 Jul 2003 22:42:12 +0000
Subject: [PATCH]   wxUSE_STL=1 compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/list.h   | 21 ++++++++++++---------
 include/wx/tipwin.h |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/include/wx/list.h b/include/wx/list.h
index 0621496821..57351e9469 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -980,29 +980,31 @@ private:
 
 #endif // !wxUSE_STL
 
-// =============================================================================
+// ============================================================================
 // now we can define classes 100% compatible with the old ones
-// =============================================================================
+// ============================================================================
 
 // ----------------------------------------------------------------------------
 // commonly used list classes
 // ----------------------------------------------------------------------------
 
-#ifdef wxLIST_COMPATIBILITY
+#if defined(wxLIST_COMPATIBILITY)
 
 // inline compatibility functions
 
-// -----------------------------------------------------------------------------
+#if !wxUSE_STL
+
+// ----------------------------------------------------------------------------
 // wxNodeBase deprecated methods
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 inline wxNode *wxNodeBase::Next() const { return (wxNode *)GetNext(); }
 inline wxNode *wxNodeBase::Previous() const { return (wxNode *)GetPrevious(); }
 inline wxObject *wxNodeBase::Data() const { return (wxObject *)GetData(); }
 
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxListBase deprecated methods
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 inline int wxListBase::Number() const { return (int)GetCount(); }
 inline wxNode *wxListBase::First() const { return (wxNode *)GetFirst(); }
@@ -1010,13 +1012,14 @@ inline wxNode *wxListBase::Last() const { return (wxNode *)GetLast(); }
 inline wxNode *wxListBase::Nth(size_t n) const { return (wxNode *)Item(n); }
 inline wxListBase::operator wxList&() const { return *(wxList*)this; }
 
+#endif
 
 // define this to make a lot of noise about use of the old wxList classes.
 //#define wxWARN_COMPAT_LIST_USE
 
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxList compatibility class: in fact, it's a list of wxObjects
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode,
                         class WXDLLIMPEXP_BASE);
diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index d8ad218f21..e322d6c41c 100644
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -28,6 +28,7 @@
 
     #define wxTipWindowBase wxFrame
 #endif
+#include "wx/arrstr.h"
 
 class WXDLLEXPORT wxTipWindowView;
 
-- 
2.45.2