Provide NSAutoreleasePool instances during initialization

[wxWidgets.git] / include / wx / list.h

diff --git a/include/wx/list.h b/include/wx/list.h
index 66dfd104edbe42570bfeb4105ee9d1a1b7e994f0..e3c8284fb63901bfffcea718848ce11b28a70a4e 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -37,11 +37,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
-// due to circular header dependencies this function has to be declared here
-// (normally it's found in utils.h which includes itself list.h...)
-extern WXDLLEXPORT wxChar* copystring(const wxChar *s);
-
-class WXDLLEXPORT wxObjectListNode;
+class WXDLLIMPEXP_BASE wxObjectListNode;
 typedef wxObjectListNode wxNode;
 
 // undef it to get rid of old, deprecated functions
@@ -88,7 +84,7 @@ union wxListKeyValue
 // for any keyed operation instead of 2 almost equivalent. OTOH, it's needed to
 // resolve ambiguity which we would otherwise have with wxStringList::Find() and
 // wxList::Find(const char *).
-class WXDLLEXPORT wxListKey
+class WXDLLIMPEXP_BASE wxListKey
 {
 public:
     // implicit ctors
@@ -129,11 +125,11 @@ private:
 // wxNodeBase class is a (base for) node in a double linked list
 // -----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
+WXDLLIMPEXP_DATA_BASE(extern wxListKey) wxDefaultListKey;
 
-class WXDLLEXPORT wxListBase;
+class WXDLLIMPEXP_BASE wxListBase;
 
-class WXDLLEXPORT wxNodeBase
+class WXDLLIMPEXP_BASE wxNodeBase
 {
 friend class wxListBase;
 public:
@@ -193,9 +189,9 @@ private:
 
 class wxList;
 
-class WXDLLEXPORT wxListBase : public wxObject
+class WXDLLIMPEXP_BASE wxListBase : public wxObject
 {
-friend class WXDLLEXPORT wxNodeBase; // should be able to call DetachNode()
+friend class WXDLLIMPEXP_BASE wxNodeBase; // should be able to call DetachNode()
 friend class wxHashTableBase;   // should be able to call untyped Find()
 private:
         // common part of all ctors
@@ -515,9 +511,9 @@ private:
 // wxList compatibility class: in fact, it's a list of wxObjects
 // -----------------------------------------------------------------------------
 
-WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, class WXDLLEXPORT);
+WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, class WXDLLIMPEXP_BASE);
 
-class WXDLLEXPORT wxList : public wxObjectList
+class WXDLLIMPEXP_BASE wxList : public wxObjectList
 {
 public:
 #ifdef wxWARN_COMPAT_LIST_USE
@@ -545,9 +541,9 @@ private:
 // wxStringList class for compatibility with the old code
 // -----------------------------------------------------------------------------
 
-WX_DECLARE_LIST_2(wxChar, wxStringListBase, wxStringListNode, class WXDLLEXPORT);
+WX_DECLARE_LIST_2(wxChar, wxStringListBase, wxStringListNode, class WXDLLIMPEXP_BASE);
 
-class WXDLLEXPORT wxStringList : public wxStringListBase
+class WXDLLIMPEXP_BASE wxStringList : public wxStringListBase
 {
 public:
     // ctors and such
@@ -568,12 +564,10 @@ public:
 
     // operations
         // makes a copy of the string
-    wxNode *Add(const wxChar *s)
-        { return (wxNode *)wxStringListBase::Append(copystring(s)); }
+    wxNode *Add(const wxChar *s);
         
         // Append to beginning of list
-    wxNode *Prepend(const wxChar *s)
-        { return (wxNode *)wxStringListBase::Insert(copystring(s)); }
+    wxNode *Prepend(const wxChar *s);
 
     bool Delete(const wxChar *s);