send more page change events (patch 750521); document this behaviour

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

diff --git a/include/wx/list.h b/include/wx/list.h
index 14a8a802da9bd11e224db8f82097857deeef1a6d..e3c8284fb63901bfffcea718848ce11b28a70a4e 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -37,11 +37,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
 #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_BASE wxChar* copystring(const wxChar *s);
-
-class WXDLLEXPORT_BASE wxObjectListNode;
+class WXDLLIMPEXP_BASE wxObjectListNode;

 typedef wxObjectListNode wxNode;
 
 // undef it to get rid of old, deprecated functions
 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 *).
 // 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_BASE wxListKey
+class WXDLLIMPEXP_BASE wxListKey

 {
 public:
     // implicit ctors
 {
 public:
     // implicit ctors


@@ -129,11 +125,11 @@ private:
 // wxNodeBase class is a (base for) node in a double linked list
 // -----------------------------------------------------------------------------
 
 // wxNodeBase class is a (base for) node in a double linked list
 // -----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA_BASE(extern wxListKey) wxDefaultListKey;
+WXDLLIMPEXP_DATA_BASE(extern wxListKey) wxDefaultListKey;

 
 

-class WXDLLEXPORT_BASE wxListBase;
+class WXDLLIMPEXP_BASE wxListBase;

 
 

-class WXDLLEXPORT_BASE wxNodeBase
+class WXDLLIMPEXP_BASE wxNodeBase

 {
 friend class wxListBase;
 public:
 {
 friend class wxListBase;
 public:


@@ -193,9 +189,9 @@ private:
 
 class wxList;
 
 
 class wxList;
 

-class WXDLLEXPORT_BASE wxListBase : public wxObject
+class WXDLLIMPEXP_BASE wxListBase : public wxObject

 {
 {

-friend class WXDLLEXPORT_BASE 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
 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
 // -----------------------------------------------------------------------------
 
 // wxList compatibility class: in fact, it's a list of wxObjects
 // -----------------------------------------------------------------------------
 

-WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, class WXDLLEXPORT_BASE);
+WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, class WXDLLIMPEXP_BASE);

 
 

-class WXDLLEXPORT_BASE wxList : public wxObjectList
+class WXDLLIMPEXP_BASE wxList : public wxObjectList

 {
 public:
 #ifdef wxWARN_COMPAT_LIST_USE
 {
 public:
 #ifdef wxWARN_COMPAT_LIST_USE


@@ -545,9 +541,9 @@ private:
 // wxStringList class for compatibility with the old code
 // -----------------------------------------------------------------------------
 
 // wxStringList class for compatibility with the old code
 // -----------------------------------------------------------------------------
 

-WX_DECLARE_LIST_2(wxChar, wxStringListBase, wxStringListNode, class WXDLLEXPORT_BASE);
+WX_DECLARE_LIST_2(wxChar, wxStringListBase, wxStringListNode, class WXDLLIMPEXP_BASE);

 
 

-class WXDLLEXPORT_BASE wxStringList : public wxStringListBase
+class WXDLLIMPEXP_BASE wxStringList : public wxStringListBase

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such


@@ -568,12 +564,10 @@ public:
 
     // operations
         // makes a copy of the string
 
     // 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
         
         // 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);
 
 
     bool Delete(const wxChar *s);