Window management and sizer layout corrections

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

diff --git a/include/wx/list.h b/include/wx/list.h
index f5bf5336cc3d198d6f94fc9aa86cc79f74a06885..d2c4bf87fc802b9f25503ee05f24038b12faab87 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -64,7 +64,10 @@ enum wxKeyType
 // type of compare function for list sort operation (as in 'qsort'): it should
 // return a negative value, 0 or positive value if the first element is less
 // than, equal or greater than the second
 // type of compare function for list sort operation (as in 'qsort'): it should
 // return a negative value, 0 or positive value if the first element is less
 // than, equal or greater than the second

+extern "C"
+{

 typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2);
 typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2);

+}

 
 //
 typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
 
 //
 typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);


@@ -128,6 +131,8 @@ private:
 
 WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
 
 
 WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
 

+class WXDLLEXPORT wxListBase;
+

 class WXDLLEXPORT wxNodeBase
 {
 friend class wxListBase;
 class WXDLLEXPORT wxNodeBase
 {
 friend class wxListBase;


@@ -183,10 +188,14 @@ private:
 // -----------------------------------------------------------------------------
 // a double-linked list class
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // a double-linked list class
 // -----------------------------------------------------------------------------

+

 class WXDLLEXPORT wxListBase : public wxObject
 {
 friend class wxNodeBase;        // should be able to call DetachNode()
 friend class wxHashTableBase;   // should be able to call untyped Find()
 class WXDLLEXPORT wxListBase : public wxObject
 {
 friend class wxNodeBase;        // should be able to call DetachNode()
 friend class wxHashTableBase;   // should be able to call untyped Find()

+private:
+        // common part of all ctors
+    void Init(wxKeyType keyType = wxKEY_NONE); // Must be declared before it's used (for VC++ 1.5)

 public:
     // default ctor & dtor
     wxListBase(wxKeyType keyType = wxKEY_NONE) { Init(keyType); }
 public:
     // default ctor & dtor
     wxListBase(wxKeyType keyType = wxKEY_NONE) { Init(keyType); }


@@ -246,7 +255,7 @@ public:
 
 protected:
         // copy ctor and assignment operator
 
 protected:
         // copy ctor and assignment operator

-    wxListBase(const wxListBase& list)
+    wxListBase(const wxListBase& list) : wxObject()

         { Init(); DoCopy(list); }
     wxListBase& operator=(const wxListBase& list)
         { Clear(); DoCopy(list); return *this; }
         { Init(); DoCopy(list); }
     wxListBase& operator=(const wxListBase& list)
         { Clear(); DoCopy(list); return *this; }


@@ -264,6 +273,9 @@ protected:
 
     // operations
         // append to end of list
 
     // operations
         // append to end of list

+    wxNodeBase *Prepend(void *object)
+        { return (wxNodeBase *)wxListBase::Insert(object); }
+        // append to beginning of list

     wxNodeBase *Append(void *object);
         // insert a new item at the beginning of the list
     wxNodeBase *Insert(void *object) { return Insert( (wxNodeBase*)NULL, object); }
     wxNodeBase *Append(void *object);
         // insert a new item at the beginning of the list
     wxNodeBase *Insert(void *object) { return Insert( (wxNodeBase*)NULL, object); }


@@ -308,8 +320,6 @@ protected:
 
 private:
     // helpers
 
 private:
     // helpers

-        // common part of all ctors
-    void Init(wxKeyType keyType = wxKEY_NONE);

         // common part of copy ctor and assignment operator
     void DoCopy(const wxListBase& list);
         // common part of all Append()s
         // common part of copy ctor and assignment operator
     void DoCopy(const wxListBase& list);
         // common part of all Append()s


@@ -439,7 +449,7 @@ private:
             { wxListBase::Sort((wxSortCompareFunction)func); }              \
                                                                             \
     protected:                                                              \
             { wxListBase::Sort((wxSortCompareFunction)func); }              \
                                                                             \
     protected:                                                              \

-        wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,          \
+        virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,  \

                                void *data,                                  \
                                const wxListKey& key = wxDefaultListKey)     \
             {                                                               \
                                void *data,                                  \
                                const wxListKey& key = wxDefaultListKey)     \
             {                                                               \


@@ -460,10 +470,18 @@ private:
     typedef elementtype _WX_LIST_ITEM_TYPE_##listname;                      \
     WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, class WXDLLEXPORT)
 
     typedef elementtype _WX_LIST_ITEM_TYPE_##listname;                      \
     WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, class WXDLLEXPORT)
 

+#define WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo)       \
+    typedef elementtype _WX_LIST_ITEM_TYPE_##listname;                      \
+    WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, class usergoo)
+

 // this macro must be inserted in your program after
 //      #include <wx/listimpl.cpp>
 #define WX_DEFINE_LIST(name)    "don't forget to include listimpl.cpp!"
 
 // this macro must be inserted in your program after
 //      #include <wx/listimpl.cpp>
 #define WX_DEFINE_LIST(name)    "don't forget to include listimpl.cpp!"
 

+#define WX_DEFINE_EXPORTED_LIST(name)      WX_DEFINE_LIST(name)
+#define WX_DEFINE_USER_EXPORTED_LIST(name) WX_DEFINE_LIST(name)
+
+

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


@@ -484,9 +502,8 @@ class WXDLLEXPORT wxList : public wxObjectList
 {
 public:
     wxList(int key_type = wxKEY_NONE) : wxObjectList((wxKeyType)key_type) { }
 {
 public:
     wxList(int key_type = wxKEY_NONE) : wxObjectList((wxKeyType)key_type) { }

-#ifdef __WXMAC_X__
-   ~wxList() {}   // Added min for Mac X
-#endif
+    // this destructor is required for Darwin
+   ~wxList() { }

 
     wxList& operator=(const wxList& list)
         { return (wxList&)wxListBase::operator=(list); }
 
     wxList& operator=(const wxList& list)
         { return (wxList&)wxListBase::operator=(list); }


@@ -495,6 +512,9 @@ public:
     void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
 
     wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
     void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
 
     wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxList)

 };
 
 // -----------------------------------------------------------------------------
 };
 
 // -----------------------------------------------------------------------------


@@ -513,7 +533,7 @@ public:
 
         // copying the string list: the strings are copied, too (extremely
         // inefficient!)
 
         // copying the string list: the strings are copied, too (extremely
         // inefficient!)

-    wxStringList(const wxStringList& other) { DeleteContents(TRUE); DoCopy(other); }
+    wxStringList(const wxStringList& other) : wxStringListBase() { DeleteContents(TRUE); DoCopy(other); }

     wxStringList& operator=(const wxStringList& other)
         { Clear(); DoCopy(other); return *this; }
 
     wxStringList& operator=(const wxStringList& other)
         { Clear(); DoCopy(other); return *this; }
 


@@ -521,6 +541,10 @@ public:
         // makes a copy of the string
     wxNode *Add(const wxChar *s)
         { return (wxNode *)wxStringListBase::Append(copystring(s)); }
         // makes a copy of the string
     wxNode *Add(const wxChar *s)
         { return (wxNode *)wxStringListBase::Append(copystring(s)); }

+        
+        // Append to beginning of list
+    wxNode *Prepend(const wxChar *s)
+        { return (wxNode *)wxStringListBase::Insert(copystring(s)); }

 
     bool Delete(const wxChar *s);
 
 
     bool Delete(const wxChar *s);
 


@@ -532,6 +556,8 @@ public:
 
 private:
     void DoCopy(const wxStringList&); // common part of copy ctor and operator=
 
 private:
     void DoCopy(const wxStringList&); // common part of copy ctor and operator=

+
+    DECLARE_DYNAMIC_CLASS(wxStringList)

 };
 
 #endif // wxLIST_COMPATIBILITY
 };
 
 #endif // wxLIST_COMPATIBILITY