// -----------------------------------------------------------------------------
#include "wx/defs.h"
-#include "wx/debug.h"
#include "wx/object.h"
#include "wx/string.h"
// 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 wxListIterateFunction)(void *current);
{
public:
// implicit ctors
- wxListKey()
- { m_keyType = wxKEY_NONE; }
- wxListKey(long i)
- { m_keyType = wxKEY_INTEGER; m_key.integer = i; }
- wxListKey(const wxChar *s)
- { m_keyType = wxKEY_STRING; m_key.string = wxStrdup(s); }
- wxListKey(const wxString& s)
- { m_keyType = wxKEY_STRING; m_key.string = wxStrdup(s.c_str()); }
+ wxListKey() : m_keyType(wxKEY_NONE)
+ { }
+ wxListKey(long i) : m_keyType(wxKEY_INTEGER)
+ { m_key.integer = i; }
+ wxListKey(const wxChar *s) : m_keyType(wxKEY_STRING)
+ { m_key.string = wxStrdup(s); }
+ wxListKey(const wxString& s) : m_keyType(wxKEY_STRING)
+ { m_key.string = wxStrdup(s.c_str()); }
// accessors
wxKeyType GetKeyType() const { return m_keyType; }
WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
+class WXDLLEXPORT wxListBase;
+
class WXDLLEXPORT wxNodeBase
{
friend class wxListBase;
*m_previous;
wxListBase *m_list; // list we belong to
+
+ DECLARE_NO_COPY_CLASS(wxNodeBase)
};
// -----------------------------------------------------------------------------
// 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()
+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); }
+ wxListBase(wxKeyType keyType = wxKEY_NONE)
+ { Init(keyType); }
virtual ~wxListBase();
// accessors
protected:
// copy ctor and assignment operator
- wxListBase(const wxListBase& list)
- { DoCopy(list); }
+ wxListBase(const wxListBase& list) : wxObject()
+ { Init(); DoCopy(list); }
wxListBase& operator=(const wxListBase& list)
{ Clear(); DoCopy(list); return *this; }
// 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); }
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
// wxWindowBase pointers are put into the list, but wxWindow pointers are
// retrieved from it.
-#define WX_DECLARE_LIST_3(T, Tbase, name, nodetype) \
+#define WX_DECLARE_LIST_3(T, Tbase, name, nodetype, classexp) \
typedef int (*wxSortFuncFor_##name)(const T **, const T **); \
\
- class WXDLLEXPORT nodetype : public wxNodeBase \
+ classexp nodetype : public wxNodeBase \
{ \
public: \
nodetype(wxListBase *list = (wxListBase *)NULL, \
virtual void DeleteData(); \
}; \
\
- class WXDLLEXPORT name : public wxListBase \
+ classexp name : public wxListBase \
{ \
public: \
typedef nodetype Node; \
name(size_t count, T *elements[]) \
: wxListBase(count, (void **)elements) { } \
\
+ name& operator=(const name& list) \
+ { (void) wxListBase::operator=(list); return *this; } \
+ \
nodetype *GetFirst() const \
{ return (nodetype *)wxListBase::GetFirst(); } \
nodetype *GetLast() const \
{ wxListBase::Sort((wxSortCompareFunction)func); } \
\
protected: \
- wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \
+ virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \
void *data, \
const wxListKey& key = wxDefaultListKey) \
{ \
} \
}
-#define WX_DECLARE_LIST_2(elementtype, listname, nodename) \
- WX_DECLARE_LIST_3(elementtype, elementtype, listname, nodename)
+#define WX_DECLARE_LIST_2(elementtype, listname, nodename, classexp) \
+ WX_DECLARE_LIST_3(elementtype, elementtype, listname, nodename, classexp)
#define WX_DECLARE_LIST(elementtype, listname) \
typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \
- WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node)
+ WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, class)
+
+#define WX_DECLARE_EXPORTED_LIST(elementtype, listname) \
+ 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!"
+#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
// =============================================================================
// wxList compatibility class: in fact, it's a list of wxObjects
// -----------------------------------------------------------------------------
-WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode);
+WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, class WXDLLEXPORT);
class WXDLLEXPORT wxList : public wxObjectList
{
public:
wxList(int key_type = wxKEY_NONE) : wxObjectList((wxKeyType)key_type) { }
+ // this destructor is required for Darwin
+ ~wxList() { }
+
+ wxList& operator=(const wxList& list)
+ { (void) wxListBase::operator=(list); return *this; }
// compatibility methods
void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxList)
};
// -----------------------------------------------------------------------------
// wxStringList class for compatibility with the old code
// -----------------------------------------------------------------------------
-WX_DECLARE_LIST_2(wxChar, wxStringListBase, wxStringListNode);
+WX_DECLARE_LIST_2(wxChar, wxStringListBase, wxStringListNode, class WXDLLEXPORT);
class WXDLLEXPORT wxStringList : public wxStringListBase
{
// 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; }
// 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);
private:
void DoCopy(const wxStringList&); // common part of copy ctor and operator=
+
+ DECLARE_DYNAMIC_CLASS(wxStringList)
};
#endif // wxLIST_COMPATIBILITY
projects / wxWidgets.git / blobdiff