wxUSE_STL=1 compilation fixes.

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

diff --git a/include/wx/list.h b/include/wx/list.h
index 0621496821b89f3c61e161c6383e17b6a84172be..57351e946990eae0c0a57eee6d7237c434d4062e 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -980,29 +980,31 @@ private:
 
 #endif // !wxUSE_STL
 
 
 #endif // !wxUSE_STL
 

-// =============================================================================
+// ============================================================================

 // now we can define classes 100% compatible with the old ones
 // now we can define classes 100% compatible with the old ones

-// =============================================================================
+// ============================================================================

 
 // ----------------------------------------------------------------------------
 // commonly used list classes
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // commonly used list classes
 // ----------------------------------------------------------------------------
 

-#ifdef wxLIST_COMPATIBILITY
+#if defined(wxLIST_COMPATIBILITY)

 
 // inline compatibility functions
 
 
 // inline compatibility functions
 

-// -----------------------------------------------------------------------------
+#if !wxUSE_STL
+
+// ----------------------------------------------------------------------------

 // wxNodeBase deprecated methods
 // 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(); }
 
 
 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
 // wxListBase deprecated methods

-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 inline int wxListBase::Number() const { return (int)GetCount(); }
 inline wxNode *wxListBase::First() const { return (wxNode *)GetFirst(); }
 
 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; }
 
 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
 
 
 // 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
 // wxList compatibility class: in fact, it's a list of wxObjects

-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode,
                         class WXDLLIMPEXP_BASE);
 
 WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode,
                         class WXDLLIMPEXP_BASE);

diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index d8ad218f2190e2cca2e416ffc943a75d2bb42a40..e322d6c41ce9cf8e077969100f7902c0cb0c9cd0 100644 (file)
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -28,6 +28,7 @@
 
     #define wxTipWindowBase wxFrame
 #endif
 
     #define wxTipWindowBase wxFrame
 #endif

+#include "wx/arrstr.h"

 
 class WXDLLEXPORT wxTipWindowView;
 
 
 class WXDLLEXPORT wxTipWindowView;