#include "wx/defs.h"
#include "wx/list.h"
#include "wx/utils.h"
+#include <wx/intl.h>
#endif
// Sun CC compatibility (interference with xview/pkg.h, apparently...)
previous = last_one;
next = next_one;
list = the_list;
- key.string = NULL;
+ key.string = (char *) NULL;
if (previous)
previous->next = this;
wxList::wxList (void)
{
- first_node = NULL;
- last_node = NULL;
+ first_node = (wxNode *) NULL;
+ last_node = (wxNode *) NULL;
n = 0;
destroy_data = 0;
key_type = wxKEY_NONE;
}
-wxList::wxList (const int N, wxObject * Objects[])
+wxList::wxList (int N, wxObject * Objects[])
{
- wxNode *last = NULL;
+ wxNode *last = (wxNode *) NULL;
int i;
for (i = 0; i < N; i++)
{
- wxNode *next = new wxNode (this, last, NULL, Objects[i]);
+ wxNode *next = new wxNode (this, last, (wxNode *) NULL, Objects[i]);
last = next;
if (i == 0)
first_node = next;
{
n = 0;
destroy_data = 0;
- first_node = NULL;
- last_node = NULL;
+ first_node = (wxNode *) NULL;
+ last_node = (wxNode *) NULL;
key_type = the_key_type;
}
va_start (ap, first_one);
- wxNode *last = new wxNode (this, NULL, NULL, first_one);
+ wxNode *last = new wxNode (this, (wxNode *) NULL, (wxNode *) NULL, first_one);
first_node = last;
n = 1;
{
wxObject *object = va_arg (ap, wxObject *);
// if (object == NULL) // Doesn't work in Windows -- segment is non-zero for NULL!
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ((int) object == 0)
#else
if ((long) object == 0)
break;
else
{
- wxNode *node = new wxNode (this, last, NULL, object);
+ wxNode *node = new wxNode (this, last, (wxNode *) NULL, object);
last = node;
n++;
}
}
}
-#ifdef USE_STORABLE_CLASSES
-wxList::wxList( istream &stream, char *WXUNUSED(data) )
-{
- char buf[200];
- unsigned int num;
- stream.read( (char*)(&num), sizeof(num) );
- for (unsigned int i = 0; i < num; i++)
- {
- int len;
- stream.read( (char*)(&len), sizeof(len) );
- stream.read( (char*)(&buf), len );
- buf[len] = 0;
- Append( wxCreateStoredObject( buf, stream, NULL ) );
- };
-};
-
-void wxList::StoreObject( ostream &stream )
-{
- unsigned int num = Number();
- stream.write( (char*)(&num), sizeof(num) );
- wxNode *node = First();
- while (node)
- {
- wxObject *obj = (wxObject*) node->Data();
- wxClassInfo *obj_info = obj->GetClassInfo();
- int len = strlen(obj_info->className);
- stream.write( (char*)(&len), sizeof(len) );
- stream.write( obj_info->className, len );
- obj->StoreObject( stream );
- node = node->Next();
- };
-};
-#endif
-
wxNode *wxList::Append(wxObject *object)
{
- wxNode *node = new wxNode(this, last_node, NULL, object);
+ wxNode *node = new wxNode(this, last_node, (wxNode *) NULL, object);
if (!first_node)
first_node = node;
last_node = node;
return node;
}
-wxNode *wxList::Nth (const int i) const
+wxNode *wxList::Nth (int i) const
{
int j = 0;
for (wxNode * current = First (); current; current = current->Next ())
if (j++ == i)
return current;
}
- return NULL; // No such element
+ return (wxNode *) NULL; // No such element
}
-wxNode *wxList::Find (const long key) const
+wxNode *wxList::Find (long key) const
{
wxNode *current = First();
while (current)
current = current->Next();
}
- return NULL; // Not found!
+ return (wxNode *) NULL; // Not found!
}
wxNode *wxList::Find (const char *key) const
{
if (!current->key.string)
{
- wxFatalError ("wxList: string key not present, probably did not Append correctly!");
+ wxFatalError (_("wxList: string key not present, probably did not Append correctly!"));
break;
}
if (strcmp (current->key.string, key) == 0)
current = current->Next();
}
- return NULL; // Not found!
+ return (wxNode *) NULL; // Not found!
}
if (each == object)
return current;
}
- return NULL;
+ return (wxNode *) NULL;
}
bool wxList::DeleteNode (wxNode * node)
// Insert new node at front of list
wxNode *wxList::Insert (wxObject * object)
{
- wxNode *node = new wxNode (this, NULL, First (), object);
+ wxNode *node = new wxNode (this, (wxNode *) NULL, First (), object);
first_node = node;
if (!(node->Next ()))
// Insert new node before given node.
wxNode *wxList::Insert (wxNode * position, wxObject * object)
{
- wxNode *prev = NULL;
+ wxNode *prev = (wxNode *) NULL;
if (position)
prev = position->Previous ();
}
// Keyed append
-wxNode *wxList::Append (const long key, wxObject * object)
+wxNode *wxList::Append (long key, wxObject * object)
{
- wxNode *node = new wxNode (this, last_node, NULL, object, key);
+ wxNode *node = new wxNode (this, last_node, (wxNode *) NULL, object, key);
if (!first_node)
first_node = node;
last_node = node;
wxNode *wxList::Append (const char *key, wxObject * object)
{
- wxNode *node = new wxNode (this, last_node, NULL, object, key);
+ wxNode *node = new wxNode (this, last_node, (wxNode *) NULL, object, key);
if (!first_node)
first_node = node;
last_node = node;
delete current;
current = next;
}
- first_node = NULL;
- last_node = NULL;
+ first_node = (wxNode *) NULL;
+ last_node = (wxNode *) NULL;
n = 0;
}
{ if ((*F)( each->Data ())) return each->Data();
each = each->Next();
}
- return NULL;
+ return (wxNode *) NULL;
}
// Like FirstThat, but proceeds from the end backward
wxObject *wxList::LastThat(wxListIterateFunction F)
{ if ((*F)( each->Data ())) return each->Data();
each = each->Previous();
}
- return NULL;
+ return (wxNode *) NULL;
}
// (stefan.hammes@urz.uni-heidelberg.de)
{
}
+wxStringList::wxStringList (const wxStringList& list)
+{
+ (*this) = list;
+}
+
// Variable argument list, terminated by a zero
// Makes new storage for the strings
wxStringList::wxStringList (const char *first...)
n = 0;
destroy_data = 0;
key_type = wxKEY_NONE;
- first_node = NULL;
- last_node = NULL;
+ first_node = (wxNode *) NULL;
+ last_node = (wxNode *) NULL;
if (!first)
return;
va_start (ap, first);
- wxNode *last = new wxNode (this, NULL, NULL, (wxObject *) copystring (first));
+ wxNode *last = new wxNode (this, (wxNode *) NULL, (wxNode *) NULL, (wxObject *) copystring (first));
first_node = last;
n = 1;
{
char *s = va_arg (ap, char *);
// if (s == NULL)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ((int) s == 0)
#else
if ((long) s == 0)
break;
else
{
- wxNode *node = new wxNode (this, last, NULL, (wxObject *) copystring (s));
+ wxNode *node = new wxNode (this, last, (wxNode *) NULL, (wxObject *) copystring (s));
last = node;
n++;
}
wxStringList::~wxStringList (void)
{
- wxNode *each = first_node;
+ Clear();
+}
+
+void wxStringList::Clear(void)
+{
+ wxNode *each = First();
while (each)
{
char *s = (char *) each->Data ();
delete each;
each = next;
}
+ wxList::Clear();
}
wxNode *wxStringList::Add (const char *s)
}
// Only makes new strings if arg is TRUE
-char **wxStringList::ListToArray (const bool new_copies) const
+char **wxStringList::ListToArray (bool new_copies) const
{
char **string_array = new char *[Number ()];
wxNode *node = First ();
}
return FALSE;
}
+
+void wxStringList::operator= (const wxStringList& list)
+{
+ Clear();
+
+ wxNode *node = list.First();
+ while (node)
+ {
+ char *s = (char *) node->Data ();
+ Add(s);
+ node = node->Next();
+ }
+}
+
+char* wxStringList::operator[] (int i) const
+{
+ wxASSERT_MSG( (i < Number()), "Invalid index for wxStringList" );
+
+ return (char*) (Nth(i)->Data());
+}
+
projects / wxWidgets.git / blobdiff