// -----------------------------------------------------------------------------
// headers
// -----------------------------------------------------------------------------
+
#ifdef __GNUG__
-#pragma implementation "list.h"
+ #pragma implementation "list.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/utils.h" // for copystring() (beurk...)
#endif
-// Sun CC compatibility (interference with xview/pkg.h, apparently...)
-// But XView is no longer supported.
-/*
-#if defined (SUN_CC) || defined(__SUNCC__) && defined(__XVIEW__)
- #undef va_start
- #undef va_end
- #undef va_arg
- #undef va_list
-#endif
-*/
-
// =============================================================================
// implementation
// =============================================================================
// wxListKey
// -----------------------------------------------------------------------------
+wxListKey wxDefaultListKey;
+
bool wxListKey::operator==(wxListKeyValue value) const
{
switch ( m_keyType )
{
default:
- wxFAIL_MSG("bad key type.");
+ wxFAIL_MSG(wxT("bad key type."));
// let compiler optimize the line above away in release build
// by not putting return here...
case wxKEY_STRING:
- return strcmp(m_key.string, value.string) == 0;
+ return wxStrcmp(m_key.string, value.string) == 0;
case wxKEY_INTEGER:
return m_key.integer == value.integer;
case wxKEY_STRING:
// to be free()d later
- m_key.string = strdup(key.GetString());
+ m_key.string = wxStrdup(key.GetString());
break;
default:
- wxFAIL_MSG("invalid key type");
+ wxFAIL_MSG(wxT("invalid key type"));
}
if ( previous )
// compatibility with old code
if ( m_list != NULL )
{
+ if ( m_list->m_keyType == wxKEY_STRING )
+ {
+ free(m_key.string);
+ }
+
m_list->DetachNode(this);
}
}
int wxNodeBase::IndexOf() const
{
- wxCHECK_MSG( m_list, NOT_FOUND, "node doesn't belong to a list in IndexOf");
+ wxCHECK_MSG( m_list, wxNOT_FOUND, wxT("node doesn't belong to a list in IndexOf"));
// It would be more efficient to implement IndexOf() completely inside
// wxListBase (only traverse the list once), but this is probably a more
// wxListBase
// -----------------------------------------------------------------------------
-void wxListBase::Init(wxKeyType keyType = wxKEY_NONE)
+void wxListBase::Init(wxKeyType keyType)
{
m_nodeFirst =
m_nodeLast = (wxNodeBase *) NULL;
void wxListBase::DoCopy(const wxListBase& list)
{
wxASSERT_MSG( !list.m_destroy,
- "copying list which owns it's elements is a bad idea" );
+ wxT("copying list which owns it's elements is a bad idea") );
- m_count = list.m_count;
m_destroy = list.m_destroy;
m_keyType = list.m_keyType;
m_nodeFirst =
m_nodeLast = (wxNodeBase *) NULL;
- for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+ switch (m_keyType)
{
- Append(node);
+ case wxKEY_INTEGER:
+ {
+ long key;
+ for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+ {
+ key = node->GetKeyInteger();
+ Append(key, node->GetData());
+ }
+ break;
+ }
+
+ case wxKEY_STRING:
+ {
+ const wxChar *key;
+ for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+ {
+ key = node->GetKeyString();
+ Append(key, node->GetData());
+ }
+ break;
+ }
+
+ default:
+ {
+ for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+ {
+ Append(node->GetData());
+ }
+ break;
+ }
}
+
+ wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );
}
wxListBase::~wxListBase()
{
// all objects in a keyed list should have a key
wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
- "need a key for the object to append" );
+ wxT("need a key for the object to append") );
- wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object);
+ // we use wxDefaultListKey even though it is the default parameter value
+ // because gcc under Mac OS X seems to miscompile this call otherwise
+ wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object,
+ wxDefaultListKey);
return AppendCommon(node);
}
wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
(m_keyType == wxKEY_NONE && m_count == 0),
(wxNodeBase *)NULL,
- "can't append object with numeric key to this list" );
+ wxT("can't append object with numeric key to this list") );
wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
return AppendCommon(node);
}
-wxNodeBase *wxListBase::Append (const char *key, void *object)
+wxNodeBase *wxListBase::Append (const wxChar *key, void *object)
{
wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
(m_keyType == wxKEY_NONE && m_count == 0),
(wxNodeBase *)NULL,
- "can't append object with string key to this list" );
+ wxT("can't append object with string key to this list") );
wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
return AppendCommon(node);
{
// all objects in a keyed list should have a key
wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
- "need a key for the object to insert" );
+ wxT("need a key for the object to insert") );
wxCHECK_MSG( !position || position->m_list == this, (wxNodeBase *)NULL,
- "can't insert before a node from another list" );
+ wxT("can't insert before a node from another list") );
// previous and next node for the node being inserted
wxNodeBase *prev, *next;
next = m_nodeFirst;
}
- wxNodeBase *node = CreateNode(prev, next, object);
+ // wxDefaultListKey: see comment in Append() above
+ wxNodeBase *node = CreateNode(prev, next, object, wxDefaultListKey);
if ( !m_nodeFirst )
{
m_nodeLast = node;
}
}
- wxFAIL_MSG( "invalid index in wxListBase::Item" );
+ wxFAIL_MSG( wxT("invalid index in wxListBase::Item") );
return (wxNodeBase *)NULL;
}
wxNodeBase *wxListBase::Find(const wxListKey& key) const
{
wxASSERT_MSG( m_keyType == key.GetKeyType(),
- "this list is not keyed on the type of this key" );
+ wxT("this list is not keyed on the type of this key") );
for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
{
{
wxNodeBase *node = Find( object );
- return node ? node->IndexOf() : NOT_FOUND;
+ return node ? node->IndexOf() : wxNOT_FOUND;
}
void wxListBase::DoDeleteNode(wxNodeBase *node)
node->DeleteData();
}
+ // so that the node knows that it's being deleted by the list
+ node->m_list = NULL;
delete node;
}
wxNodeBase *wxListBase::DetachNode(wxNodeBase *node)
{
- wxCHECK_MSG( node, NULL, "detaching NULL wxNodeBase" );
+ wxCHECK_MSG( node, NULL, wxT("detaching NULL wxNodeBase") );
wxCHECK_MSG( node->m_list == this, NULL,
- "detaching node which is not from this list" );
+ wxT("detaching node which is not from this list") );
// update the list
wxNodeBase **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next
delete[] objArray;
}
+// ============================================================================
+// compatibility section from now on
+// ============================================================================
+
+#ifdef wxLIST_COMPATIBILITY
+
// -----------------------------------------------------------------------------
// wxList (a.k.a. wxObjectList)
// -----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
+
void wxObjectListNode::DeleteData()
{
delete (wxObject *)GetData();
// wxStringList
// -----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
+
// instead of WX_DEFINE_LIST(wxStringListBase) we define this function
// ourselves
void wxStringListNode::DeleteData()
delete [] (char *)GetData();
}
-bool wxStringList::Delete(const char *s)
+bool wxStringList::Delete(const wxChar *s)
{
wxStringListNode *current;
for ( current = GetFirst(); current; current = current->GetNext() )
{
- if ( strcmp(current->GetData(), s) == 0 )
+ if ( wxStrcmp(current->GetData(), s) == 0 )
{
DeleteNode(current);
return TRUE;
// Variable argument list, terminated by a zero
// Makes new storage for the strings
-wxStringList::wxStringList (const char *first, ...)
+wxStringList::wxStringList (const wxChar *first, ...)
{
+ DeleteContents(TRUE);
if ( !first )
return;
va_list ap;
va_start(ap, first);
- const char *s = first;
+ const wxChar *s = first;
for (;;)
{
Add(s);
- s = va_arg(ap, const char *);
+ s = va_arg(ap, const wxChar *);
// if (s == NULL)
#ifdef __WXMSW__
- if ((int) s == 0)
+ if ((int)(long) s == 0)
#else
if ((long) s == 0)
#endif
}
// Only makes new strings if arg is TRUE
-char **wxStringList::ListToArray(bool new_copies) const
+wxChar **wxStringList::ListToArray(bool new_copies) const
{
- char **string_array = new char *[GetCount()];
+ wxChar **string_array = new wxChar *[GetCount()];
wxStringListNode *node = GetFirst();
for (size_t i = 0; i < GetCount(); i++)
{
- char *s = node->GetData();
+ wxChar *s = node->GetData();
if ( new_copies )
string_array[i] = copystring(s);
else
}
// Checks whether s is a member of the list
-bool wxStringList::Member(const char *s) const
+bool wxStringList::Member(const wxChar *s) const
{
for ( wxStringListNode *node = GetFirst(); node; node = node->GetNext() )
{
- const char *s1 = node->GetData();
- if (s == s1 || strcmp (s, s1) == 0)
+ const wxChar *s1 = node->GetData();
+ if (s == s1 || wxStrcmp (s, s1) == 0)
return TRUE;
}
return FALSE;
}
-static int
+extern "C" int LINKAGEMODE
wx_comparestrings(const void *arg1, const void *arg2)
{
- char **s1 = (char **) arg1;
- char **s2 = (char **) arg2;
+ wxChar **s1 = (wxChar **) arg1;
+ wxChar **s2 = (wxChar **) arg2;
- return strcmp (*s1, *s2);
+ return wxStrcmp (*s1, *s2);
}
// Sort a list of strings - deallocates old nodes, allocates new
void wxStringList::Sort()
{
size_t N = GetCount();
- char **array = new char *[N];
+ wxChar **array = new wxChar *[N];
wxStringListNode *node;
size_t i = 0;
array[i++] = node->GetData();
}
- qsort (array, N, sizeof (char *), wx_comparestrings);
+ qsort (array, N, sizeof (wxChar *), wx_comparestrings);
i = 0;
for ( node = GetFirst(); node; node = node->GetNext() )
delete [] array;
}
+#endif // wxLIST_COMPATIBILITY
+
projects / wxWidgets.git / blobdiff