// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
/*
// 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 char* copystring(const char *s);
+extern WXDLLEXPORT wxChar* copystring(const wxChar *s);
class WXDLLEXPORT wxObjectListNode;
typedef wxObjectListNode wxNode;
union wxListKeyValue
{
long integer;
- char *string;
+ wxChar *string;
};
// a struct which may contain both types of keys
{ m_keyType = wxKEY_NONE; }
wxListKey(long i)
{ m_keyType = wxKEY_INTEGER; m_key.integer = i; }
- wxListKey(const char *s)
- { m_keyType = wxKEY_STRING; m_key.string = strdup(s); }
+ wxListKey(const wxChar *s)
+ { m_keyType = wxKEY_STRING; m_key.string = wxStrdup(s); }
wxListKey(const wxString& s)
- { m_keyType = wxKEY_STRING; m_key.string = strdup(s.c_str()); }
+ { m_keyType = wxKEY_STRING; m_key.string = wxStrdup(s.c_str()); }
// accessors
wxKeyType GetKeyType() const { return m_keyType; }
- const char *GetString() const
+ const wxChar *GetString() const
{ wxASSERT( m_keyType == wxKEY_STRING ); return m_key.string; }
long GetNumber() const
{ wxASSERT( m_keyType == wxKEY_INTEGER ); return m_key.integer; }
// wxNodeBase class is a (base for) node in a double linked list
// -----------------------------------------------------------------------------
+WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
+
class WXDLLEXPORT wxNodeBase
{
friend class wxListBase;
wxNodeBase *previous = (wxNodeBase *)NULL,
wxNodeBase *next = (wxNodeBase *)NULL,
void *data = NULL,
- const wxListKey& key = wxListKey());
+ const wxListKey& key = wxDefaultListKey);
virtual ~wxNodeBase();
// @@ no check is done that the list is really keyed on strings
- const char *GetKeyString() const { return m_key.string; }
+ const wxChar *GetKeyString() const { return m_key.string; }
long GetKeyInteger() const { return m_key.integer; }
// Necessary for some existing code
- void SetKeyString(char* s) { m_key.string = s; }
+ void SetKeyString(wxChar* s) { m_key.string = s; }
void SetKeyInteger(long i) { m_key.integer = i; }
#ifdef wxLIST_COMPATIBILITY
void *GetData() const { return m_data; }
void SetData(void *data) { m_data = data; }
- // get 0-based index of this node within the list or NOT_FOUND
+ // get 0-based index of this node within the list or wxNOT_FOUND
int IndexOf() const;
virtual void DeleteData() { }
size_t GetCount() const { return m_count; }
// operations
-
+
// delete all nodes
void Clear();
-
+
// instruct it to destroy user data when deleting nodes
void DeleteContents(bool destroy) { m_destroy = destroy; }
// query if to delete
bool GetDeleteContents() const
{ return m_destroy; }
-
+
// get the keytype
wxKeyType GetKeyType() const
{ return m_keyType; }
void SetKeyType(wxKeyType keyType)
{ wxASSERT( m_count==0 ); m_keyType = keyType; }
+#ifdef wxLIST_COMPATIBILITY
+ int Number() const { return GetCount(); }
+ wxNode *First() const { return (wxNode *)GetFirst(); }
+ wxNode *Last() const { return (wxNode *)GetLast(); }
+ wxNode *Nth(size_t index) const { return (wxNode *)Item(index); }
+#endif // wxLIST_COMPATIBILITY
+
protected:
+
// all methods here are "overloaded" in derived classes to provide compile
// time type checking
// create a node for the list of this type
virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,
void *data,
- const wxListKey& key = wxListKey()) = 0;
+ const wxListKey& key = wxDefaultListKey) = 0;
+
+// Can't access these from derived classes otherwise (bug in Salford C++?)
+#ifdef __SALFORDC__
+public:
+#endif
// ctors
// from an array
// from a sequence of objects
wxListBase(void *object, ... /* terminate with NULL */);
+protected:
// copy ctor and assignment operator
wxListBase(const wxListBase& list)
{ DoCopy(list); }
// keyed append
wxNodeBase *Append(long key, void *object);
- wxNodeBase *Append(const char *key, void *object);
+ wxNodeBase *Append(const wxChar *key, void *object);
// removes node from the list but doesn't delete it (returns pointer
// to the node or NULL if it wasn't found in the list)
// by key
wxNodeBase *Find(const wxListKey& key) const;
- // get 0-based index of object or NOT_FOUND
+ // get 0-based index of object or wxNOT_FOUND
int IndexOf( void *object ) const;
// this function allows the sorting of arbitrary lists by giving
void *FirstThat(wxListIterateFunction func);
void ForEach(wxListIterateFunction func);
void *LastThat(wxListIterateFunction func);
-
+
private:
// helpers
// common part of all ctors
- void Init(wxKeyType keyType);
+ 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
// declare a list type named 'name' and containing elements of type 'T *'
// (as a by product of macro expansion you also get wx##name##Node
-// wxNode-dervied type)
+// wxNode-derived type)
//
// implementation details:
-// 1. we define _WX_LIST_ITEM_TYPE_##name typedef to save in it the item type
+// 1. We define _WX_LIST_ITEM_TYPE_##name typedef to save in it the item type
// for the list of given type - this allows us to pass only the list name
// to WX_DEFINE_LIST() even if it needs both the name and the type
//
-// 2. We redefine all not type-safe wxList functions withtype-safe versions
-// which don't take any place (everything is inline), but bring compile
+// 2. We redefine all non-type-safe wxList functions with type-safe versions
+// which don't take any space (everything is inline), but bring compile
// time error checking.
#define WX_DECLARE_LIST_2(T, name, nodetype) \
nodetype *previous = (nodetype *)NULL, \
nodetype *next = (nodetype *)NULL, \
T *data = (T *)NULL, \
- const wxListKey& key = wxListKey()) \
+ const wxListKey& key = wxDefaultListKey) \
: wxNodeBase(list, previous, next, data, key) { } \
\
nodetype *GetNext() const \
virtual void DeleteData(); \
}; \
\
- class WXDLLEXPORT name : public wxListBase \
+ class WXDLLEXPORT name : public wxListBase \
{ \
public: \
+ typedef nodetype Node; \
+ \
name(wxKeyType keyType = wxKEY_NONE) : wxListBase(keyType) \
{ } \
name(size_t count, T *elements[]) \
\
nodetype *Append(long key, void *object) \
{ return (nodetype *)wxListBase::Append(key, object); } \
- nodetype *Append(const char *key, void *object) \
+ nodetype *Append(const wxChar *key, void *object) \
{ return (nodetype *)wxListBase::Append(key, object); } \
\
nodetype *DetachNode(nodetype *node) \
protected: \
wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \
void *data, \
- const wxListKey& key = wxListKey()) \
+ const wxListKey& key = wxDefaultListKey) \
{ \
return new nodetype(this, \
(nodetype *)prev, (nodetype *)next, \
// #include <wx/listimpl.cpp>
#define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!"
-
// =============================================================================
// now we can define classes 100% compatible with the old ones
// =============================================================================
+// ----------------------------------------------------------------------------
+// commonly used string classes
+// ----------------------------------------------------------------------------
+
+class wxWindow;
+WX_DECLARE_LIST(wxWindow, wxWindowList);
+
#ifdef wxLIST_COMPATIBILITY
// -----------------------------------------------------------------------------
// compatibility methods
void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
- int Number() const { return GetCount(); }
- wxNode *First() const { return (wxNode *)GetFirst(); }
- wxNode *Last() const { return (wxNode *)GetLast(); }
- wxNode *Nth(size_t index) const { return (wxNode *)Item(index); }
wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
};
// wxStringList class for compatibility with the old code
// -----------------------------------------------------------------------------
-WX_DECLARE_LIST_2(char, wxStringListBase, wxStringListNode);
+WX_DECLARE_LIST_2(wxChar, wxStringListBase, wxStringListNode);
class WXDLLEXPORT wxStringList : public wxStringListBase
{
// ctors and such
// default
wxStringList() { DeleteContents(TRUE); }
- wxStringList(const char *first ...);
+ wxStringList(const wxChar *first ...);
// copying the string list: the strings are copied, too (extremely
// inefficient!)
// operations
// makes a copy of the string
- wxNode *Add(const char *s)
+ wxNode *Add(const wxChar *s)
{ return (wxNode *)wxStringListBase::Append(copystring(s)); }
- bool Delete(const char *s);
+ bool Delete(const wxChar *s);
- char **ListToArray(bool new_copies = FALSE) const;
- bool Member(const char *s) const;
+ wxChar **ListToArray(bool new_copies = FALSE) const;
+ bool Member(const wxChar *s) const;
// alphabetic sort
void Sort();
- // compatibility methods
- int Number() const { return GetCount(); }
- wxNode *First() const { return (wxNode *)GetFirst(); }
- wxNode *Last() const { return (wxNode *)GetLast(); }
- wxNode *Nth(size_t index) const { return (wxNode *)Item(index); }
-
private:
void DoCopy(const wxStringList&); // common part of copy ctor and operator=
};
projects / wxWidgets.git / blobdiff