X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..467a2982d277060eced5160b4dc88daff442eb87:/src/common/variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 679113976e..b71f67801d 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        variant.cpp
+// Name:        src/common/variant.cpp
 // Purpose:     wxVariant class, container for any type
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "variant.h"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -20,6 +16,19 @@
     #pragma hdrstop
 #endif
 
+#include "wx/variant.h"
+
+#if wxUSE_VARIANT
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/math.h"
+    #include "wx/crt.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
+#endif
+
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
@@ -29,286 +38,198 @@
 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000
+namespace std {}
 using namespace std ;
 #endif
 
 #if wxUSE_STREAMS
-#include "wx/stream.h"
-#include "wx/txtstrm.h"
+    #include "wx/txtstrm.h"
 #endif
 
 #include "wx/string.h"
 #include "wx/tokenzr.h"
 
-#include "wx/variant.h"
+wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
-IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
-wxVariant WXDLLIMPEXP_BASE wxNullVariant;
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxVariantList)
 
 /*
- * wxVariantDataList
+ * wxVariant
  */
 
-class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
-{
-DECLARE_DYNAMIC_CLASS(wxVariantDataList)
-public:
-    wxVariantDataList() {}
-    wxVariantDataList(const wxList& list);
-    ~wxVariantDataList();
-
-    wxList& GetValue() const { return (wxList&) m_value; }
-    void SetValue(const wxList& value) ;
-
-    virtual void Copy(wxVariantData& data);
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("list"); };
-
-    void Clear();
-
-protected:
-    wxList  m_value;
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData)
+IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
 
-wxVariantDataList::wxVariantDataList(const wxList& list)
+wxVariant::wxVariant()
 {
-    SetValue(list);
+    m_data = (wxVariantData*) NULL;
 }
 
-wxVariantDataList::~wxVariantDataList()
+bool wxVariant::IsNull() const
 {
-    Clear();
+     return (m_data == (wxVariantData*) NULL);
 }
 
-void wxVariantDataList::SetValue(const wxList& value)
+void wxVariant::MakeNull()
 {
-    Clear();
-    wxList::compatibility_iterator node = value.GetFirst();
-    while (node)
-    {
-        wxVariant* var = (wxVariant*) node->GetData();
-        m_value.Append(new wxVariant(*var));
-        node = node->GetNext();
-    }
+    UnRef();
 }
 
-void wxVariantDataList::Clear()
+void wxVariant::Clear()
 {
-    wxList::compatibility_iterator node = m_value.GetFirst();
-    while (node)
-    {
-        wxVariant* var = (wxVariant*) node->GetData();
-        delete var;
-        node = node->GetNext();
-    }
-    m_value.Clear();
+    m_name = wxEmptyString;
 }
 
-void wxVariantDataList::Copy(wxVariantData& data)
+wxVariant::wxVariant(const wxVariant& variant)
+    : wxObject()
 {
-    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Copy: Can't copy to this type of data") );
+    m_data = (wxVariantData*) NULL;
 
-    wxVariantDataList& listData = (wxVariantDataList&) data;
+    if (!variant.IsNull())
+        Ref(variant);
 
-    listData.Clear();
-    wxList::compatibility_iterator node = m_value.GetFirst();
-    while (node)
-    {
-        wxVariant* var = (wxVariant*) node->GetData();
-        listData.m_value.Append(new wxVariant(*var));
-        node = node->GetNext();
-    }
+    m_name = variant.m_name;
 }
 
-bool wxVariantDataList::Eq(wxVariantData& data) const
+wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data
 {
-    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
-
-    wxVariantDataList& listData = (wxVariantDataList&) data;
-    wxList::compatibility_iterator node1 = m_value.GetFirst();
-    wxList::compatibility_iterator node2 = listData.GetValue().GetFirst();
-    while (node1 && node2)
-    {
-        wxVariant* var1 = (wxVariant*) node1->GetData();
-        wxVariant* var2 = (wxVariant*) node2->GetData();
-        if ((*var1) != (*var2))
-            return FALSE;
-        node1 = node1->GetNext();
-        node2 = node2->GetNext();
-    }
-    if (node1 || node2) return FALSE;
-    return TRUE;
+    m_data = data;
+    m_name = name;
 }
 
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Write(wxSTD ostream& str) const
+wxVariant::~wxVariant()
 {
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return TRUE;
+    UnRef();
 }
-#endif
 
-bool wxVariantDataList::Write(wxString& str) const
+// Assignment
+void wxVariant::operator= (const wxVariant& variant)
 {
-    str = wxT("");
-    wxList::compatibility_iterator node = m_value.GetFirst();
-    while (node)
-    {
-        wxVariant* var = (wxVariant*) node->GetData();
-        if (node != m_value.GetFirst())
-          str += wxT(" ");
-        wxString str1;
-        str += var->MakeString();
-        node = node->GetNext();
-    }
-
-    return TRUE;
+    Ref(variant);
+    m_name = variant.m_name;
 }
 
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
+// myVariant = new wxStringVariantData("hello")
+void wxVariant::operator= (wxVariantData* variantData)
 {
-    wxFAIL_MSG(wxT("Unimplemented"));
-    // TODO
-    return FALSE;
+    UnRef();
+    m_data = variantData;
 }
-#endif
 
-bool wxVariantDataList::Read(wxString& WXUNUSED(str))
+bool wxVariant::operator== (const wxVariant& variant) const
 {
-    wxFAIL_MSG(wxT("Unimplemented"));
-    // TODO
-    return FALSE;
-}
+    if (IsNull() || variant.IsNull())
+        return (IsNull() == variant.IsNull());
 
-/*
- * wxVariantDataStringList
- */
+    return (GetData()->Eq(* variant.GetData()));
+}
 
-class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData
+bool wxVariant::operator!= (const wxVariant& variant) const
 {
-DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
-public:
-    wxVariantDataStringList() {}
-    wxVariantDataStringList(const wxStringList& list) { m_value = list; }
-
-    wxStringList& GetValue() const { return (wxStringList&) m_value; }
-    void SetValue(const wxStringList& value);
-
-    virtual void Copy(wxVariantData& data);
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("stringlist"); };
-
-protected:
-    wxStringList  m_value;
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataStringList, wxVariantData)
+    return (!(*this == variant));
+}
 
-void wxVariantDataStringList::SetValue(const wxStringList& value)
+wxString wxVariant::MakeString() const
 {
-    m_value = value;
+    if (!IsNull())
+    {
+        wxString str;
+        if (GetData()->Write(str))
+            return str;
+    }
+    return wxEmptyString;
 }
 
-void wxVariantDataStringList::Copy(wxVariantData& data)
+void wxVariant::SetData(wxVariantData* data)
 {
-    wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Copy: Can't copy to this type of data") );
-
-    wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
-
-    listData.m_value = m_value ;
+    UnRef();
+    m_data = data;
 }
 
-bool wxVariantDataStringList::Eq(wxVariantData& data) const
+void wxVariant::Ref(const wxVariant& clone)
 {
-    wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
+    // nothing to be done
+    if (m_data == clone.m_data)
+        return;
 
-    wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
-    wxStringList::compatibility_iterator node1 = m_value.GetFirst();
-    wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst();
-    while (node1 && node2)
+    // delete reference to old data
+    UnRef();
+
+    // reference new data
+    if ( clone.m_data )
     {
-        wxString str1 ( node1->GetData() );
-        wxString str2 ( node2->GetData() );
-        if (str1 != str2)
-            return FALSE;
-        node1 = node1->GetNext();
-        node2 = node2->GetNext();
+        m_data = clone.m_data;
+        m_data->m_count++;
     }
-    if (node1 || node2) return FALSE;
-    return TRUE;
 }
 
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataStringList::Write(wxSTD ostream& str) const
+
+void wxVariant::UnRef()
 {
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return TRUE;
+    if ( m_data )
+    {
+        wxASSERT_MSG( m_data->m_count > 0, _T("invalid ref data count") );
+
+        m_data->DecRef();
+        m_data = NULL;
+    }
 }
-#endif
 
-bool wxVariantDataStringList::Write(wxString& str) const
+bool wxVariant::Unshare()
 {
-    str.Empty();
-    wxStringList::compatibility_iterator node = m_value.GetFirst();
-    while (node)
+    if ( m_data && m_data->GetRefCount() > 1 )
     {
-        const wxChar* s = node->GetData();
-        if (node != m_value.GetFirst())
-          str += wxT(" ");
-        str += s;
-        node = node->GetNext();
+        // note that ref is not going to be destroyed in this case...
+        const wxVariantData* ref = m_data;
+        UnRef();
+
+        // ... so we can still access it
+        m_data = ref->Clone();
+
+        wxASSERT_MSG( (m_data && m_data->GetRefCount() == 1),
+                  _T("wxVariant::AllocExclusive() failed.") );
+
+        if (!m_data || m_data->GetRefCount() != 1)
+            return false;
+        else
+            return true;
     }
+    //else: data is null or ref count is 1, so we are exclusive owners of m_refData anyhow
+    else
+        return true;
+}
+
 
-    return TRUE;
+// Returns a string representing the type of the variant,
+// e.g. "string", "bool", "list", "double", "long"
+wxString wxVariant::GetType() const
+{
+    if (IsNull())
+        return wxString(wxT("null"));
+    else
+        return GetData()->GetType();
 }
 
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
+
+bool wxVariant::IsType(const wxString& type) const
 {
-    wxFAIL_MSG(wxT("Unimplemented"));
-    // TODO
-    return FALSE;
+    return (GetType() == type);
 }
-#endif
 
-bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
+bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
 {
-    wxFAIL_MSG(wxT("Unimplemented"));
-    // TODO
-    return FALSE;
+    wxClassInfo* info=GetData()->GetValueClassInfo();
+    return info ? info->IsKindOf(type) : false ;
 }
 
-/*
- * wxVariantDataLong
- */
+
+// -----------------------------------------------------------------
+// wxVariantDataLong
+// -----------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
 {
-DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
 public:
     wxVariantDataLong() { m_value = 0; }
     wxVariantDataLong(long value) { m_value = value; }
@@ -316,7 +237,6 @@ public:
     inline long GetValue() const { return m_value; }
     inline void SetValue(long value) { m_value = value; }
 
-    virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual bool Read(wxString& str);
@@ -330,23 +250,14 @@ public:
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
-    virtual wxString GetType() const { return wxT("long"); };
+    wxVariantData* Clone() const { return new wxVariantDataLong(m_value); }
+
+    virtual wxString GetType() const { return wxT("long"); }
 
 protected:
     long m_value;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
-
-void wxVariantDataLong::Copy(wxVariantData& data)
-{
-    wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Copy: Can't copy to this type of data") );
-
-    wxVariantDataLong& otherData = (wxVariantDataLong&) data;
-
-    otherData.m_value = m_value;
-}
-
 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") );
@@ -362,21 +273,21 @@ bool wxVariantDataLong::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataLong::Write(wxString& str) const
 {
     str.Printf(wxT("%ld"), m_value);
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataLong::Read(wxSTD istream& str)
 {
     str >> m_value;
-    return TRUE;
+    return true;
 }
 #endif
 
@@ -386,38 +297,96 @@ bool wxVariantDataLong::Write(wxOutputStream& str) const
     wxTextOutputStream s(str);
 
     s.Write32((size_t)m_value);
-    return TRUE;
+    return true;
 }
 
 bool wxVariantDataLong::Read(wxInputStream& str)
 {
    wxTextInputStream s(str);
    m_value = s.Read32();
-   return TRUE;
+   return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataLong::Read(wxString& str)
 {
-    m_value = wxAtol((const wxChar*) str);
-    return TRUE;
+    m_value = wxAtol(str);
+    return true;
 }
 
-/*
- * wxVariantDataReal
- */
+// wxVariant
+
+wxVariant::wxVariant(long val, const wxString& name)
+{
+    m_data = new wxVariantDataLong(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(int val, const wxString& name)
+{
+    m_data = new wxVariantDataLong((long)val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(short val, const wxString& name)
+{
+    m_data = new wxVariantDataLong((long)val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (long value) const
+{
+    long thisValue;
+    if (!Convert(&thisValue))
+        return false;
+    else
+        return (value == thisValue);
+}
+
+bool wxVariant::operator!= (long value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (long value)
+{
+    if (GetType() == wxT("long") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataLong*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataLong(value);
+    }
+}
+
+long wxVariant::GetLong() const
+{
+    long value;
+    if (Convert(& value))
+        return value;
+    else
+    {
+        wxFAIL_MSG(wxT("Could not convert to a long"));
+        return 0;
+    }
+}
 
-class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData
+// -----------------------------------------------------------------
+// wxVariantDoubleData
+// -----------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData
 {
-DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
 public:
-    wxVariantDataReal() { m_value = 0.0; }
-    wxVariantDataReal(double value) { m_value = value; }
+    wxVariantDoubleData() { m_value = 0.0; }
+    wxVariantDoubleData(double value) { m_value = value; }
 
     inline double GetValue() const { return m_value; }
     inline void SetValue(double value) { m_value = value; }
 
-    virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
     virtual bool Read(wxString& str);
 #if wxUSE_STD_IOSTREAM
@@ -431,86 +400,124 @@ public:
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("double"); };
+    virtual wxString GetType() const { return wxT("double"); }
 
+    wxVariantData* Clone() const { return new wxVariantDoubleData(m_value); }
 protected:
     double m_value;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData)
-
-void wxVariantDataReal::Copy(wxVariantData& data)
-{
-    wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Copy: Can't copy to this type of data") );
-
-    wxVariantDataReal& otherData = (wxVariantDataReal&) data;
-
-    otherData.m_value = m_value;
-}
-
-bool wxVariantDataReal::Eq(wxVariantData& data) const
+bool wxVariantDoubleData::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Eq: argument mismatch") );
+    wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") );
 
-    wxVariantDataReal& otherData = (wxVariantDataReal&) data;
+    wxVariantDoubleData& otherData = (wxVariantDoubleData&) data;
 
-    return (otherData.m_value == m_value);
+    return wxIsSameDouble(otherData.m_value, m_value);
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataReal::Write(wxSTD ostream& str) const
+bool wxVariantDoubleData::Write(wxSTD ostream& str) const
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
-bool wxVariantDataReal::Write(wxString& str) const
+bool wxVariantDoubleData::Write(wxString& str) const
 {
-    str.Printf(wxT("%.4f"), m_value);
-    return TRUE;
+    str.Printf(wxT("%.14g"), m_value);
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataReal::Read(wxSTD istream& str)
+bool wxVariantDoubleData::Read(wxSTD istream& str)
 {
     str >> m_value;
-    return TRUE;
+    return true;
 }
 #endif
 
 #if wxUSE_STREAMS
-bool wxVariantDataReal::Write(wxOutputStream& str) const
+bool wxVariantDoubleData::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
     s.WriteDouble((double)m_value);
-    return TRUE;
+    return true;
 }
 
-bool wxVariantDataReal::Read(wxInputStream& str)
+bool wxVariantDoubleData::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
     m_value = (float)s.ReadDouble();
-    return TRUE;
+    return true;
 }
 #endif // wxUSE_STREAMS
 
-bool wxVariantDataReal::Read(wxString& str)
+bool wxVariantDoubleData::Read(wxString& str)
 {
-    m_value = wxAtof((const wxChar*) str);
-    return TRUE;
+    m_value = wxAtof(str);
+    return true;
 }
 
+//  wxVariant double code
+
+wxVariant::wxVariant(double val, const wxString& name)
+{
+    m_data = new wxVariantDoubleData(val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (double value) const
+{
+    double thisValue;
+    if (!Convert(&thisValue))
+        return false;
+
+    return wxIsSameDouble(value, thisValue);
+}
+
+bool wxVariant::operator!= (double value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (double value)
+{
+    if (GetType() == wxT("double") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDoubleData*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDoubleData(value);
+    }
+}
+
+double wxVariant::GetDouble() const
+{
+    double value;
+    if (Convert(& value))
+        return value;
+    else
+    {
+        wxFAIL_MSG(wxT("Could not convert to a double number"));
+        return 0.0;
+    }
+}
+
+// -----------------------------------------------------------------
+// wxVariantBoolData
+// -----------------------------------------------------------------
+
 #ifdef HAVE_BOOL
-/*
- * wxVariantDataBool
- */
 
 class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
 {
-DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
 public:
     wxVariantDataBool() { m_value = 0; }
     wxVariantDataBool(bool value) { m_value = value; }
@@ -518,7 +525,6 @@ public:
     inline bool GetValue() const { return m_value; }
     inline void SetValue(bool value) { m_value = value; }
 
-    virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual bool Write(wxSTD ostream& str) const;
@@ -532,23 +538,13 @@ public:
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("bool"); };
+    virtual wxString GetType() const { return wxT("bool"); }
 
+    wxVariantData* Clone() const { return new wxVariantDataBool(m_value); }
 protected:
     bool m_value;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
-
-void wxVariantDataBool::Copy(wxVariantData& data)
-{
-    wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Copy: Can't copy to this type of data") );
-
-    wxVariantDataBool& otherData = (wxVariantDataBool&) data;
-
-    otherData.m_value = m_value;
-}
-
 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") );
@@ -564,14 +560,14 @@ bool wxVariantDataBool::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataBool::Write(wxString& str) const
 {
     str.Printf(wxT("%d"), (int) m_value);
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -579,7 +575,7 @@ bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> (long) m_value;
-    return FALSE;
+    return false;
 }
 #endif
 
@@ -589,7 +585,7 @@ bool wxVariantDataBool::Write(wxOutputStream& str) const
     wxTextOutputStream s(str);
 
     s.Write8(m_value);
-    return TRUE;
+    return true;
 }
 
 bool wxVariantDataBool::Read(wxInputStream& str)
@@ -597,32 +593,79 @@ bool wxVariantDataBool::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.Read8() != 0;
-    return TRUE;
+    return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataBool::Read(wxString& str)
 {
-    m_value = (wxAtol((const wxChar*) str) != 0);
-    return TRUE;
+    m_value = (wxAtol(str) != 0);
+    return true;
+}
+
+// wxVariant ****
+
+wxVariant::wxVariant(bool val, const wxString& name)
+{
+    m_data = new wxVariantDataBool(val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (bool value) const
+{
+    bool thisValue;
+    if (!Convert(&thisValue))
+        return false;
+    else
+        return (value == thisValue);
+}
+
+bool wxVariant::operator!= (bool value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (bool value)
+{
+    if (GetType() == wxT("bool") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataBool*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataBool(value);
+    }
+}
+
+bool wxVariant::GetBool() const
+{
+    bool value;
+    if (Convert(& value))
+        return value;
+    else
+    {
+        wxFAIL_MSG(wxT("Could not convert to a bool"));
+        return 0;
+    }
 }
+
 #endif // HAVE_BOOL
 
-/*
- * wxVariantDataChar
- */
+// -----------------------------------------------------------------
+// wxVariantDataChar
+// -----------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
 {
-DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
 public:
     wxVariantDataChar() { m_value = 0; }
-    wxVariantDataChar(char value) { m_value = value; }
+    wxVariantDataChar(const wxUniChar& value) { m_value = value; }
 
-    inline char GetValue() const { return m_value; }
-    inline void SetValue(char value) { m_value = value; }
+    inline wxUniChar GetValue() const { return m_value; }
+    inline void SetValue(const wxUniChar& value) { m_value = value; }
 
-    virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual bool Read(wxSTD istream& str);
@@ -634,23 +677,13 @@ public:
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("char"); };
+    virtual wxString GetType() const { return wxT("char"); }
+    wxVariantData* Clone() const { return new wxVariantDataChar(m_value); }
 
 protected:
-    char m_value;
+    wxUniChar m_value;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
-
-void wxVariantDataChar::Copy(wxVariantData& data)
-{
-    wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Copy: Can't copy to this type of data") );
-
-    wxVariantDataChar& otherData = (wxVariantDataChar&) data;
-
-    otherData.m_value = m_value;
-}
-
 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") );
@@ -663,25 +696,23 @@ bool wxVariantDataChar::Eq(wxVariantData& data) const
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataChar::Write(wxSTD ostream& str) const
 {
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return TRUE;
+    str << wxString(m_value);
+    return true;
 }
 #endif
 
 bool wxVariantDataChar::Write(wxString& str) const
 {
-    str.Printf(wxT("%c"), m_value);
-    return TRUE;
+    str = m_value;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
-//    str >> m_value;
-    return FALSE;
+
+    return false;
 }
 #endif
 
@@ -690,32 +721,94 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
 
-    s.Write8(m_value);
-    return TRUE;
+    // FIXME-UTF8: this should be just "s << m_value;" after removal of
+    //             ANSI build and addition of wxUniChar to wxTextOutputStream:
+    s << (wxChar)m_value;
+
+    return true;
 }
 
 bool wxVariantDataChar::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
 
-    m_value = s.Read8();
-    return TRUE;
+    // FIXME-UTF8: this should be just "s >> m_value;" after removal of
+    //             ANSI build and addition of wxUniChar to wxTextInputStream:
+    wxChar ch;
+    s >> ch;
+    m_value = ch;
+
+    return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataChar::Read(wxString& str)
 {
-    m_value = str[(size_t)0];
-    return TRUE;
+    m_value = str[0u];
+    return true;
 }
 
-/*
- * wxVariantDataString
- */
+wxVariant::wxVariant(const wxUniChar& val, const wxString& name)
+{
+    m_data = new wxVariantDataChar(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(char val, const wxString& name)
+{
+    m_data = new wxVariantDataChar(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(wchar_t val, const wxString& name)
+{
+    m_data = new wxVariantDataChar(val);
+    m_name = name;
+}
+
+bool wxVariant::operator==(const wxUniChar& value) const
+{
+    wxUniChar thisValue;
+    if (!Convert(&thisValue))
+        return false;
+    else
+        return (value == thisValue);
+}
+
+wxVariant& wxVariant::operator=(const wxUniChar& value)
+{
+    if (GetType() == wxT("char") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataChar*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataChar(value);
+    }
+
+    return *this;
+}
+
+wxUniChar wxVariant::GetChar() const
+{
+    wxUniChar value;
+    if (Convert(& value))
+        return value;
+    else
+    {
+        wxFAIL_MSG(wxT("Could not convert to a char"));
+        return wxUniChar(0);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxVariantDataString
+// ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
 {
-DECLARE_DYNAMIC_CLASS(wxVariantDataString)
 public:
     wxVariantDataString() { }
     wxVariantDataString(const wxString& value) { m_value = value; }
@@ -723,7 +816,6 @@ public:
     inline wxString GetValue() const { return m_value; }
     inline void SetValue(const wxString& value) { m_value = value; }
 
-    virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual bool Write(wxSTD ostream& str) const;
@@ -731,27 +823,19 @@ public:
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
+    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("string"); };
+    virtual wxString GetType() const { return wxT("string"); }
+    wxVariantData* Clone() const { return new wxVariantDataString(m_value); }
 
 protected:
     wxString m_value;
 };
 
-void wxVariantDataString::Copy(wxVariantData& data)
-{
-    wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Copy: Can't copy to this type of data") );
-
-    wxVariantDataString& otherData = (wxVariantDataString&) data;
-
-    otherData.m_value = m_value;
-}
-
 bool wxVariantDataString::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") );
@@ -765,23 +849,15 @@ bool wxVariantDataString::Eq(wxVariantData& data) const
 bool wxVariantDataString::Write(wxSTD ostream& str) const
 {
     str << (const char*) m_value.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataString::Write(wxString& str) const
 {
     str = m_value;
-    return TRUE;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataString::Read(wxSTD istream& str)
-{
-    str >> m_value;
-    return TRUE;
+    return true;
 }
-#endif
 
 #if wxUSE_STREAMS
 bool wxVariantDataString::Write(wxOutputStream& str) const
@@ -789,116 +865,108 @@ bool wxVariantDataString::Write(wxOutputStream& str) const
   // why doesn't wxOutputStream::operator<< take "const wxString&"
     wxTextOutputStream s(str);
     s.WriteString(m_value);
-    return TRUE;
+    return true;
 }
 
 bool wxVariantDataString::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
 
-    m_value = s.ReadString();
-    return TRUE;
+    m_value = s.ReadLine();
+    return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataString::Read(wxString& str)
 {
     m_value = str;
-    return TRUE;
+    return true;
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
-
-/*
- * wxVariantDataVoidPtr
- */
+// wxVariant ****
 
-class wxVariantDataVoidPtr: public wxVariantData
+wxVariant::wxVariant(const wxString& val, const wxString& name)
 {
-DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
-public:
-    wxVariantDataVoidPtr() { }
-    wxVariantDataVoidPtr(void* value) { m_value = value; }
-
-    inline void* GetValue() const { return m_value; }
-    inline void SetValue(void* value) { m_value = value; }
-
-    virtual void Copy(wxVariantData& data);
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("void*"); };
-    virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
-
-protected:
-    void* m_value;
-
-    DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
+    m_data = new wxVariantDataString(val);
+    m_name = name;
+}
 
-void wxVariantDataVoidPtr::Copy(wxVariantData& data)
+wxVariant::wxVariant(const char* val, const wxString& name)
 {
-    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
-
-    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+    m_data = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
 
-    otherData.m_value = m_value;
+wxVariant::wxVariant(const wchar_t* val, const wxString& name)
+{
+    m_data = new wxVariantDataString(wxString(val));
+    m_name = name;
 }
 
-bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
+wxVariant::wxVariant(const wxCStrData& val, const wxString& name)
 {
-    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
+    m_data = new wxVariantDataString(val.AsString());
+    m_name = name;
+}
 
-    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+wxVariant::wxVariant(const wxCharBuffer& val, const wxString& name)
+{
+    m_data = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
 
-    return (otherData.m_value == m_value);
+wxVariant::wxVariant(const wxWCharBuffer& val, const wxString& name)
+{
+    m_data = new wxVariantDataString(wxString(val));
+    m_name = name;
 }
 
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
+bool wxVariant::operator== (const wxString& value) const
 {
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return TRUE;
+    wxString thisValue;
+    if (!Convert(&thisValue))
+        return false;
+
+    return value == thisValue;
 }
-#endif
 
-bool wxVariantDataVoidPtr::Write(wxString& str) const
+bool wxVariant::operator!= (const wxString& value) const
 {
-    str.Printf(wxT("%ld"), (long) m_value);
-    return TRUE;
+    return (!((*this) == value));
 }
 
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
+wxVariant& wxVariant::operator= (const wxString& value)
 {
-    // Not implemented
-    return FALSE;
+    if (GetType() == wxT("string") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataString*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataString(value);
+    }
+    return *this;
 }
-#endif
 
-bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
+wxString wxVariant::GetString() const
 {
-    // Not implemented
-    return FALSE;
+    wxString value;
+    if (!Convert(& value))
+    {
+        wxFAIL_MSG(wxT("Could not convert to a string"));
+    }
+
+    return value;
 }
 
-/*
- * wxVariantDataWxObjectPtr
- */
+// ----------------------------------------------------------------------------
+// wxVariantDataWxObjectPtr
+// ----------------------------------------------------------------------------
 
 class wxVariantDataWxObjectPtr: public wxVariantData
 {
-DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)
 public:
     wxVariantDataWxObjectPtr() { }
     wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }
@@ -906,7 +974,6 @@ public:
     inline wxObject* GetValue() const { return m_value; }
     inline void SetValue(wxObject* value) { m_value = value; }
 
-    virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual bool Write(wxSTD ostream& str) const;
@@ -917,31 +984,17 @@ public:
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const ;
-    virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }
+    virtual wxVariantData* Clone() const { return new wxVariantDataWxObjectPtr(m_value); }
+
+    virtual wxClassInfo* GetValueClassInfo();
 
-    virtual wxClassInfo* GetValueClassInfo() ; 
 protected:
     wxObject* m_value;
-
-    DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr)
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData)
-
-void wxVariantDataWxObjectPtr::Copy(wxVariantData& data)
-{
-    wxASSERT_MSG(  wxIsKindOf((&data), wxVariantDataWxObjectPtr) ,\
-                   wxT("wxVariantDataWxObjectPtr::Copy: Can't copy to this type of data") \
-                 );
-
-    wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
-
-    otherData.m_value = m_value;
-}
-
 bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG(   wxIsKindOf((&data), wxVariantDataWxObjectPtr), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );
+    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );
 
     wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
 
@@ -950,18 +1003,22 @@ bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
 
 wxString wxVariantDataWxObjectPtr::GetType() const
 {
-    wxString returnVal(wxT("wxObject"));
-    if (m_value) {
+    wxString returnVal(wxT("wxObject*"));
+
+    if (m_value)
+    {
         returnVal = m_value->GetClassInfo()->GetClassName();
+        returnVal += wxT("*");
     }
+
     return returnVal;
 }
 
 wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()
 {
     wxClassInfo* returnVal=NULL;
-    
-    if (m_value) returnVal = m_value->GetClassInfo(); 
+
+    if (m_value) returnVal = m_value->GetClassInfo();
 
     return returnVal;
 }
@@ -972,145 +1029,72 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataWxObjectPtr::Write(wxString& str) const
 {
-    str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value);
-    return TRUE;
+    str.Printf(wxT("%s(%p)"), GetType().c_str(), wx_static_cast(void*, m_value));
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 #endif
 
 bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))
 {
     // Not implemented
-    return FALSE;
-}
-
-
-/*
- * wxVariantDataDateTime
- */
-
-#if wxUSE_DATETIME
-
-class wxVariantDataDateTime: public wxVariantData
-{
-    DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
-
-public:
-    wxVariantDataDateTime() { }
-    wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
-#if wxUSE_ODBC
-    wxVariantDataDateTime(const TIME_STRUCT* valptr)
-        { m_value = wxDateTime(valptr->hour, valptr->minute, valptr->second); }
-    wxVariantDataDateTime(const DATE_STRUCT* valptr)
-        { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); }
-    wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr)
-        { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year,
-                        valptr->hour, valptr->minute, valptr->second, valptr->fraction ); }
-#endif //ODBC
-
-    inline wxDateTime GetValue() const { return m_value; }
-    inline void SetValue(const wxDateTime& value) { m_value = value; }
-
-    virtual void Copy(wxVariantData& data);
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("datetime"); };
-    virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
-
-protected:
-    wxDateTime m_value;
-};
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
-
-void wxVariantDataDateTime::Copy(wxVariantData& data)
-{
-    wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Copy: Can't copy to this type of data") );
-
-    wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
-
-    otherData.m_value = m_value;
+    return false;
 }
 
+// wxVariant
 
-bool wxVariantDataDateTime::Eq(wxVariantData& data) const
+wxVariant::wxVariant( wxObject* val, const wxString& name)
 {
-    wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") );
-
-    wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
-
-    return (otherData.m_value == m_value);
+    m_data = new wxVariantDataWxObjectPtr(val);
+    m_name = name;
 }
 
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
+bool wxVariant::operator== (wxObject* value) const
 {
-    // Not implemented
-    return FALSE;
+    return (value == ((wxVariantDataWxObjectPtr*)GetData())->GetValue());
 }
-#endif
 
-
-bool wxVariantDataDateTime::Write(wxString& str) const
+bool wxVariant::operator!= (wxObject* value) const
 {
-    str = m_value.Format();
-    return TRUE;
+    return (!((*this) == (wxObject*) value));
 }
 
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
+void wxVariant::operator= (wxObject* value)
 {
-    // Not implemented
-    return FALSE;
+    UnRef();
+    m_data = new wxVariantDataWxObjectPtr(value);
 }
-#endif
 
-
-bool wxVariantDataDateTime::Read(wxString& str)
+wxObject* wxVariant::GetWxObjectPtr() const
 {
-    if(! m_value.ParseDateTime(str))
-        return FALSE;
-    return TRUE;
+    return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
 }
 
-#endif // wxUSE_DATETIME
-
 // ----------------------------------------------------------------------------
-// wxVariantDataArrayString
+// wxVariantDataVoidPtr
 // ----------------------------------------------------------------------------
 
-class wxVariantDataArrayString: public wxVariantData
+class wxVariantDataVoidPtr: public wxVariantData
 {
 public:
-    wxVariantDataArrayString() { }
-    wxVariantDataArrayString(const wxArrayString& value) { m_value = value; }
+    wxVariantDataVoidPtr() { }
+    wxVariantDataVoidPtr(void* value) { m_value = value; }
 
-    wxArrayString GetValue() const { return m_value; }
-    void SetValue(const wxArrayString& value) { m_value = value; }
+    inline void* GetValue() const { return m_value; }
+    inline void SetValue(void* value) { m_value = value; }
 
-    virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual bool Write(wxSTD ostream& str) const;
@@ -1120,563 +1104,309 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("arrstring"); };
-    virtual wxVariantData* Clone() { return new wxVariantDataArrayString; }
+    virtual wxString GetType() const { return wxT("void*"); }
+    virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); }
 
 protected:
-    wxArrayString m_value;
-
-    DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString)
+    void* m_value;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData)
-
-void wxVariantDataArrayString::Copy(wxVariantData& data)
-{
-    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Copy: Can't copy to this type of data") );
-
-    wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
-
-    otherData.m_value = m_value;
-}
-
-
-bool wxVariantDataArrayString::Eq(wxVariantData& data) const
+bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") );
+    wxASSERT_MSG( data.GetType() == wxT("void*"), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
 
-    wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
+    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 
-    return otherData.m_value == m_value;
+    return (otherData.m_value == m_value);
 }
 
-
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataArrayString::Write(wxSTD ostream& str) const
+bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
 {
-    // Not implemented
-    return FALSE;
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
 }
 #endif
 
-
-bool wxVariantDataArrayString::Write(wxString& str) const
+bool wxVariantDataVoidPtr::Write(wxString& str) const
 {
-    size_t count = m_value.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        if ( n )
-            str += _T(';');
-
-        str += m_value[n];
-    }
-
-    return TRUE;
+    str.Printf(wxT("%p"), m_value);
+    return true;
 }
 
-
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
-    return FALSE;
-}
-#endif
-
-
-bool wxVariantDataArrayString::Read(wxString& str)
-{
-    wxStringTokenizer tk(str, _T(";"));
-    while ( tk.HasMoreTokens() )
-    {
-        m_value.Add(tk.GetNextToken());
-    }
-
-    return TRUE;
-}
-
-
-
-/*
- * wxVariant
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
-
-// Construction & destruction
-wxVariant::wxVariant()
-{
-    m_data = (wxVariantData*) NULL;
-}
-
-wxVariant::wxVariant(double val, const wxString& name)
-{
-    m_data = new wxVariantDataReal(val);
-    m_name = name;
-}
-
-wxVariant::wxVariant(long val, const wxString& name)
-{
-    m_data = new wxVariantDataLong(val);
-    m_name = name;
-}
-
-#ifdef HAVE_BOOL
-wxVariant::wxVariant(bool val, const wxString& name)
-{
-    m_data = new wxVariantDataBool(val);
-    m_name = name;
+    return false;
 }
 #endif
 
-wxVariant::wxVariant(char val, const wxString& name)
-{
-    m_data = new wxVariantDataChar(val);
-    m_name = name;
-}
-
-wxVariant::wxVariant(const wxString& val, const wxString& name)
-{
-    m_data = new wxVariantDataString(val);
-    m_name = name;
-}
-
-wxVariant::wxVariant(const wxChar* val, const wxString& name)
-{
-    m_data = new wxVariantDataString(wxString(val));
-    m_name = name;
-}
-
-wxVariant::wxVariant(const wxStringList& val, const wxString& name)
+bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
 {
-    m_data = new wxVariantDataStringList(val);
-    m_name = name;
+    // Not implemented
+    return false;
 }
 
-wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants
-{
-    m_data = new wxVariantDataList(val);
-    m_name = name;
-}
+// wxVariant
 
 wxVariant::wxVariant( void* val, const wxString& name)
 {
-   m_data = new wxVariantDataVoidPtr(val);
-   m_name = name;
-}
-
-wxVariant::wxVariant( wxObject* val, const wxString& name)
-{
-   m_data = new wxVariantDataWxObjectPtr(val);
-   m_name = name;
-}
-
-#if wxUSE_DATETIME
-wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
-{
-	m_data = new wxVariantDataDateTime(val);
-	m_name = name;
-}
-#endif // wxUSE_DATETIME    
-
-#if wxUSE_ODBC
-wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDateTime(valptr);
-    m_name = name;
-}
-
-wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDateTime(valptr);
+    m_data = new wxVariantDataVoidPtr(val);
     m_name = name;
 }
 
-wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date
+bool wxVariant::operator== (void* value) const
 {
-    m_data = new wxVariantDataDateTime(valptr);
-    m_name = name;
+    return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
 }
-#endif // wxUSE_ODBC
 
-wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
+bool wxVariant::operator!= (void* value) const
 {
-    m_data = new wxVariantDataArrayString(val);
-    m_name = name;
+    return (!((*this) == (void*) value));
 }
 
-wxVariant::wxVariant(const wxVariant& variant)
-    : wxObject()
+void wxVariant::operator= (void* value)
 {
-    if (!variant.IsNull())
+    if (GetType() == wxT("void*") && (m_data->GetRefCount() == 1))
     {
-        m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject();
-        variant.m_data->Copy(*m_data);
+        ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
     }
     else
-        m_data = (wxVariantData*) NULL;
-    m_name = variant.m_name;
+    {
+        UnRef();
+        m_data = new wxVariantDataVoidPtr(value);
+    }
 }
 
-wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data
+void* wxVariant::GetVoidPtr() const
 {
-    m_data = data;
-    m_name = name;
-}
+    wxASSERT( (GetType() == wxT("void*")) );
 
-wxVariant::~wxVariant()
-{
-    delete m_data;
+    return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 
+// ----------------------------------------------------------------------------
+// wxVariantDataDateTime
+// ----------------------------------------------------------------------------
 
-// Make NULL (i.e. delete the data)
-void wxVariant::MakeNull()
-{
-    delete m_data;
-    m_data = NULL;
-}
+#if wxUSE_DATETIME
 
-// Generic operators
-// Assignment
-void wxVariant::operator= (const wxVariant& variant)
+class wxVariantDataDateTime: public wxVariantData
 {
-    if (variant.IsNull())
-    {
-        MakeNull();
-        return;
-    }
-
-    if (IsNull() || (GetType() != variant.GetType()))
-    {
-        if (m_data)
-            delete m_data;
-        m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject();
-    }
-
-    variant.GetData()->Copy(* GetData());
+public:
+    wxVariantDataDateTime() { }
+    wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
 
-    m_name = variant.m_name;
-}
+    inline wxDateTime GetValue() const { return m_value; }
+    inline void SetValue(const wxDateTime& value) { m_value = value; }
 
-// Assignment using data, e.g.
-// myVariant = new wxStringVariantData("hello")
-void wxVariant::operator= (wxVariantData* variantData)
-{
-    MakeNull();
-    m_data = variantData;
-}
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+    virtual bool Read(wxString& str);
+    virtual wxString GetType() const { return wxT("datetime"); }
+    virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); }
 
-bool wxVariant::operator== (const wxVariant& variant) const
-{
-    if (IsNull() || variant.IsNull())
-        return (IsNull() == variant.IsNull());
+protected:
+    wxDateTime m_value;
+};
 
-    return (GetData()->Eq(* variant.GetData()));
-}
 
-bool wxVariant::operator!= (const wxVariant& variant) const
+bool wxVariantDataDateTime::Eq(wxVariantData& data) const
 {
-    return (!(*this == variant));
-}
-
+    wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") );
 
-// Specific operators
-bool wxVariant::operator== (double value) const
-{
-    double thisValue;
-    if (!Convert(&thisValue))
-        return FALSE;
-    else
-        return (value == thisValue);
-}
+    wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
 
-bool wxVariant::operator!= (double value) const
-{
-    return (!((*this) == value));
+    return (otherData.m_value == m_value);
 }
 
-void wxVariant::operator= (double value)
-{
-    if (GetType() == wxT("double"))
-    {
-        ((wxVariantDataReal*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataReal(value);
-    }
-}
 
-bool wxVariant::operator== (long value) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
 {
-    long thisValue;
-    if (!Convert(&thisValue))
-        return FALSE;
-    else
-        return (value == thisValue);
+    wxString value;
+    Write( value );
+    str << value.c_str();
+    return true;
 }
+#endif
 
-bool wxVariant::operator!= (long value) const
-{
-    return (!((*this) == value));
-}
 
-void wxVariant::operator= (long value)
+bool wxVariantDataDateTime::Write(wxString& str) const
 {
-    if (GetType() == wxT("long"))
-    {
-        ((wxVariantDataLong*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataLong(value);
-    }
+    str = m_value.Format();
+    return true;
 }
 
-bool wxVariant::operator== (char value) const
-{
-    char thisValue;
-    if (!Convert(&thisValue))
-        return FALSE;
-    else
-        return (value == thisValue);
-}
 
-bool wxVariant::operator!= (char value) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
 {
-    return (!((*this) == value));
+    // Not implemented
+    return false;
 }
+#endif
 
-void wxVariant::operator= (char value)
-{
-    if (GetType() == wxT("char"))
-    {
-        ((wxVariantDataChar*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataChar(value);
-    }
-}
 
-#ifdef HAVE_BOOL
-bool wxVariant::operator== (bool value) const
+bool wxVariantDataDateTime::Read(wxString& str)
 {
-    bool thisValue;
-    if (!Convert(&thisValue))
-        return FALSE;
-    else
-        return (value == thisValue);
+    if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/))
+        return false;
+    return true;
 }
 
-bool wxVariant::operator!= (bool value) const
-{
-    return (!((*this) == value));
-}
+// wxVariant
 
-void wxVariant::operator= (bool value)
+wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
 {
-    if (GetType() == wxT("bool"))
-    {
-        ((wxVariantDataBool*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataBool(value);
-    }
+    m_data = new wxVariantDataDateTime(val);
+    m_name = name;
 }
-#endif // HAVE_BOOL
 
-bool wxVariant::operator== (const wxString& value) const
+bool wxVariant::operator== (const wxDateTime& value) const
 {
-    wxString thisValue;
+    wxDateTime thisValue;
     if (!Convert(&thisValue))
-        return FALSE;
+        return false;
 
-    return value == thisValue;
+    return value.IsEqualTo(thisValue);
 }
 
-bool wxVariant::operator!= (const wxString& value) const
+bool wxVariant::operator!= (const wxDateTime& value) const
 {
     return (!((*this) == value));
 }
 
-void wxVariant::operator= (const wxString& value)
+void wxVariant::operator= (const wxDateTime& value)
 {
-    if (GetType() == wxT("string"))
+    if (GetType() == wxT("datetime") &&
+        m_data->GetRefCount() == 1)
     {
-        ((wxVariantDataString*)GetData())->SetValue(value);
+        ((wxVariantDataDateTime*)GetData())->SetValue(value);
     }
     else
     {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataString(value);
+        UnRef();
+        m_data = new wxVariantDataDateTime(value);
     }
 }
 
-void wxVariant::operator= (const wxChar* value)
+wxDateTime wxVariant::GetDateTime() const
 {
-    if (GetType() == wxT("string"))
-    {
-        ((wxVariantDataString*)GetData())->SetValue(wxString(value));
-    }
-    else
+    wxDateTime value;
+    if (!Convert(& value))
     {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataString(wxString(value));
+        wxFAIL_MSG(wxT("Could not convert to a datetime"));
     }
-}
-
-bool wxVariant::operator== (const wxStringList& value) const
-{
-    wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
 
-    wxVariantDataStringList other(value);
-    return (m_data->Eq(other));
-}
-
-bool wxVariant::operator!= (const wxStringList& value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxStringList& value)
-{
-    if (GetType() == wxT("stringlist"))
-    {
-        ((wxVariantDataStringList*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataStringList(value);
-    }
+    return value;
 }
 
-bool wxVariant::operator== (const wxList& value) const
-{
-    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
+#endif // wxUSE_DATETIME
 
-    wxVariantDataList other(value);
-    return (m_data->Eq(other));
-}
+// ----------------------------------------------------------------------------
+// wxVariantDataArrayString
+// ----------------------------------------------------------------------------
 
-bool wxVariant::operator!= (const wxList& value) const
+class wxVariantDataArrayString: public wxVariantData
 {
-    return (!((*this) == value));
-}
+public:
+    wxVariantDataArrayString() { }
+    wxVariantDataArrayString(const wxArrayString& value) { m_value = value; }
 
-void wxVariant::operator= (const wxList& value)
-{
-    if (GetType() == wxT("list"))
-    {
-        ((wxVariantDataList*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataList(value);
-    }
-}
+    wxArrayString GetValue() const { return m_value; }
+    void SetValue(const wxArrayString& value) { m_value = value; }
 
-bool wxVariant::operator== (void* value) const
-{
-    return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
-}
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+    virtual bool Read(wxString& str);
+    virtual wxString GetType() const { return wxT("arrstring"); }
+    virtual wxVariantData* Clone() const { return new wxVariantDataArrayString(m_value); }
 
-bool wxVariant::operator!= (void* value) const
-{
-    return (!((*this) == (void*) value));
-}
+protected:
+    wxArrayString m_value;
+};
 
-void wxVariant::operator= (void* value)
+bool wxVariantDataArrayString::Eq(wxVariantData& data) const
 {
-    if (GetType() == wxT("void*"))
-    {
-        ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataVoidPtr(value);
-    }
-}
+    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") );
 
-#if wxUSE_DATETIME
-bool wxVariant::operator== (const wxDateTime& value) const
-{
-    wxDateTime thisValue;
-    if (!Convert(&thisValue))
-        return FALSE;
+    wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
 
-    return value.IsEqualTo(thisValue);
+    return otherData.m_value == m_value;
 }
 
-bool wxVariant::operator!= (const wxDateTime& value) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(str)) const
 {
-    return (!((*this) == value));
+    // Not implemented
+    return false;
 }
+#endif
 
-void wxVariant::operator= (const wxDateTime& value)
+bool wxVariantDataArrayString::Write(wxString& str) const
 {
-    if (GetType() == wxT("datetime"))
-    {
-        ((wxVariantDataDateTime*)GetData())->SetValue(value);
-    }
-    else
+    size_t count = m_value.GetCount();
+    for ( size_t n = 0; n < count; n++ )
     {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataDateTime(value);
+        if ( n )
+            str += _T(';');
+
+        str += m_value[n];
     }
+
+    return true;
 }
-#endif // wxUSE_DATETIME
 
-#if wxUSE_ODBC
-void wxVariant::operator= (const DATE_STRUCT* value)
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
 {
-    if (m_data)
-        delete m_data;
-    m_data = new wxVariantDataDateTime(value);
+    // Not implemented
+    return false;
 }
+#endif
 
 
-void wxVariant::operator= (const TIME_STRUCT* value)
+bool wxVariantDataArrayString::Read(wxString& str)
 {
-    if (m_data)
-        delete m_data;
-    m_data = new wxVariantDataDateTime(value);
+    wxStringTokenizer tk(str, _T(";"));
+    while ( tk.HasMoreTokens() )
+    {
+        m_value.Add(tk.GetNextToken());
+    }
+
+    return true;
 }
 
+// wxVariant
 
-void wxVariant::operator= (const TIMESTAMP_STRUCT* value)
+wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
 {
-    if (m_data)
-        delete m_data;
-    m_data = new wxVariantDataDateTime(value);
+    m_data = new wxVariantDataArrayString(val);
+    m_name = name;
 }
 
-#endif // wxUSE_ODBC
-
 bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
 {
     wxFAIL_MSG( _T("TODO") );
 
-    return FALSE;
+    return false;
 }
 
 bool wxVariant::operator!=(const wxArrayString& value) const
@@ -1686,13 +1416,14 @@ bool wxVariant::operator!=(const wxArrayString& value) const
 
 void wxVariant::operator=(const wxArrayString& value)
 {
-    if (GetType() == wxT("arrstring"))
+    if (GetType() == wxT("arrstring") &&
+        m_data->GetRefCount() == 1)
     {
         ((wxVariantDataArrayString *)GetData())->SetValue(value);
     }
     else
     {
-        delete m_data;
+        UnRef();
         m_data = new wxVariantDataArrayString(value);
     }
 }
@@ -1705,213 +1436,187 @@ wxArrayString wxVariant::GetArrayString() const
     return wxArrayString();
 }
 
+// ----------------------------------------------------------------------------
+// wxVariantDataList
+// ----------------------------------------------------------------------------
 
-// Treat a list variant as an array
-wxVariant wxVariant::operator[] (size_t idx) const
+class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
 {
-    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );
-
-    if (GetType() == wxT("list"))
-    {
-        wxVariantDataList* data = (wxVariantDataList*) m_data;
-        wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
-        return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
-    }
-    else if (GetType() == wxT("stringlist"))
-    {
-        wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
-        wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
+public:
+    wxVariantDataList() {}
+    wxVariantDataList(const wxVariantList& list);
+    virtual ~wxVariantDataList();
 
-        wxVariant variant( wxString( (const wxChar*) (data->GetValue().Item(idx)->GetData()) ));
-        return variant;
-    }
-    return wxNullVariant;
-}
+    wxVariantList& GetValue() { return m_value; }
+    void SetValue(const wxVariantList& value) ;
 
-wxVariant& wxVariant::operator[] (size_t idx)
-{
-    // We can't return a reference to a variant for a string list, since the string
-    // is actually stored as a char*, not a variant.
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+    virtual bool Read(wxString& str);
+    virtual wxString GetType() const { return wxT("list"); }
 
-    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
+    void Clear();
 
-    wxVariantDataList* data = (wxVariantDataList*) m_data;
-    wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
+    wxVariantData* Clone() const { return new wxVariantDataList(m_value); }
+protected:
+    wxVariantList  m_value;
+};
 
-    return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
+wxVariantDataList::wxVariantDataList(const wxVariantList& list)
+{
+    SetValue(list);
 }
 
-// Return the number of elements in a list
-int wxVariant::GetCount() const
+wxVariantDataList::~wxVariantDataList()
 {
-    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") );
-
-    if (GetType() == wxT("list"))
-    {
-        wxVariantDataList* data = (wxVariantDataList*) m_data;
-        return data->GetValue().GetCount();
-    }
-    else if (GetType() == wxT("stringlist"))
-    {
-        wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
-        return data->GetValue().GetCount();
-    }
-    return 0;
+    Clear();
 }
 
-wxString wxVariant::MakeString() const
+void wxVariantDataList::SetValue(const wxVariantList& value)
 {
-    if (!IsNull())
+    Clear();
+    wxVariantList::compatibility_iterator node = value.GetFirst();
+    while (node)
     {
-        wxString str;
-        if (GetData()->Write(str))
-            return str;
+        wxVariant* var = node->GetData();
+        m_value.Append(new wxVariant(*var));
+        node = node->GetNext();
     }
-    return wxString(wxT(""));
 }
 
-// Accessors
-
-void wxVariant::SetData(wxVariantData* data)
+void wxVariantDataList::Clear()
 {
-    if (m_data) delete m_data;
-    m_data = data;
+    wxVariantList::compatibility_iterator node = m_value.GetFirst();
+    while (node)
+    {
+        wxVariant* var = node->GetData();
+        delete var;
+        node = node->GetNext();
+    }
+    m_value.Clear();
 }
 
-
-// Returns a string representing the type of the variant,
-// e.g. "string", "bool", "stringlist", "list", "double", "long"
-wxString wxVariant::GetType() const
+bool wxVariantDataList::Eq(wxVariantData& data) const
 {
-    if (IsNull())
-        return wxString(wxT("null"));
-    else
-        return m_data->GetType();
-}
-
+    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
 
-bool wxVariant::IsType(const wxString& type) const
-{
-    return (GetType() == type);
+    wxVariantDataList& listData = (wxVariantDataList&) data;
+    wxVariantList::compatibility_iterator node1 = m_value.GetFirst();
+    wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst();
+    while (node1 && node2)
+    {
+        wxVariant* var1 = node1->GetData();
+        wxVariant* var2 = node2->GetData();
+        if ((*var1) != (*var2))
+            return false;
+        node1 = node1->GetNext();
+        node2 = node2->GetNext();
+    }
+    if (node1 || node2) return false;
+    return true;
 }
 
-bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataList::Write(wxSTD ostream& str) const
 {
-    wxClassInfo* info=m_data->GetValueClassInfo(); 
-    return info ? info->IsKindOf(type) : false ;
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
 }
+#endif
 
-
-// Value accessors
-double wxVariant::GetReal() const
+bool wxVariantDataList::Write(wxString& str) const
 {
-    double value;
-    if (Convert(& value))
-        return value;
-    else
+    str = wxEmptyString;
+    wxVariantList::compatibility_iterator node = m_value.GetFirst();
+    while (node)
     {
-        wxFAIL_MSG(wxT("Could not convert to a real number"));
-        return 0.0;
+        wxVariant* var = node->GetData();
+        if (node != m_value.GetFirst())
+          str += wxT(" ");
+        wxString str1;
+        str += var->MakeString();
+        node = node->GetNext();
     }
-}
 
-long wxVariant::GetInteger() const
-{
-    long value;
-    if (Convert(& value))
-        return value;
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to an integer"));
-        return 0;
-    }
+    return true;
 }
 
-char wxVariant::GetChar() const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
 {
-    char value;
-    if (Convert(& value))
-        return value;
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a char"));
-        return 0;
-    }
+    wxFAIL_MSG(wxT("Unimplemented"));
+    // TODO
+    return false;
 }
+#endif
 
-bool wxVariant::GetBool() const
+bool wxVariantDataList::Read(wxString& WXUNUSED(str))
 {
-    bool value;
-    if (Convert(& value))
-        return value;
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a bool"));
-        return 0;
-    }
+    wxFAIL_MSG(wxT("Unimplemented"));
+    // TODO
+    return false;
 }
 
-wxString wxVariant::GetString() const
-{
-    wxString value;
-    if (!Convert(& value))
-    {
-        wxFAIL_MSG(wxT("Could not convert to a string"));
-    }
+// wxVariant
 
-    return value;
+wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants
+{
+    m_data = new wxVariantDataList(val);
+    m_name = name;
 }
 
-void* wxVariant::GetVoidPtr() const
+bool wxVariant::operator== (const wxVariantList& value) const
 {
-    wxASSERT( (GetType() == wxT("void*")) );
+    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
 
-    return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
+    wxVariantDataList other(value);
+    return (GetData()->Eq(other));
 }
 
-wxObject* wxVariant::GetWxObjectPtr() 
+bool wxVariant::operator!= (const wxVariantList& value) const
 {
-    wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr));
-    return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
+    return (!((*this) == value));
 }
 
-#if wxUSE_DATETIME
-wxDateTime wxVariant::GetDateTime() const
+void wxVariant::operator= (const wxVariantList& value)
 {
-    wxDateTime value;
-    if (!Convert(& value))
+    if (GetType() == wxT("list") &&
+        m_data->GetRefCount() == 1)
     {
-        wxFAIL_MSG(wxT("Could not convert to a datetime"));
+        ((wxVariantDataList*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataList(value);
     }
-
-    return value;
 }
-#endif // wxUSE_DATETIME
 
-wxList& wxVariant::GetList() const
+wxVariantList& wxVariant::GetList() const
 {
     wxASSERT( (GetType() == wxT("list")) );
 
-    return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
-}
-
-wxStringList& wxVariant::GetStringList() const
-{
-    wxASSERT( (GetType() == wxT("stringlist")) );
-
-    return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
+    return (wxVariantList&) ((wxVariantDataList*) m_data)->GetValue();
 }
 
 // Make empty list
 void wxVariant::NullList()
 {
     SetData(new wxVariantDataList());
-};
+}
 
 // Append to list
 void wxVariant::Append(const wxVariant& value)
 {
-    wxList& list = GetList();
+    wxVariantList& list = GetList();
 
     list.Append(new wxVariant(value));
 }
@@ -1919,38 +1624,38 @@ void wxVariant::Append(const wxVariant& value)
 // Insert at front of list
 void wxVariant::Insert(const wxVariant& value)
 {
-    wxList& list = GetList();
+    wxVariantList& list = GetList();
 
     list.Insert(new wxVariant(value));
 }
 
-// Returns TRUE if the variant is a member of the list
+// Returns true if the variant is a member of the list
 bool wxVariant::Member(const wxVariant& value) const
 {
-    wxList& list = GetList();
+    wxVariantList& list = GetList();
 
-    wxList::compatibility_iterator node = list.GetFirst();
+    wxVariantList::compatibility_iterator node = list.GetFirst();
     while (node)
     {
-        wxVariant* other = (wxVariant*) node->GetData();
+        wxVariant* other = node->GetData();
         if (value == *other)
-            return TRUE;
+            return true;
         node = node->GetNext();
     }
-    return FALSE;
+    return false;
 }
 
 // Deletes the nth element of the list
-bool wxVariant::Delete(int item)
+bool wxVariant::Delete(size_t item)
 {
-    wxList& list = GetList();
+    wxVariantList& list = GetList();
 
-    wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") );
-    wxList::compatibility_iterator node = list.Item(item);
-    wxVariant* variant = (wxVariant*) node->GetData();
+    wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );
+    wxVariantList::compatibility_iterator node = list.Item(item);
+    wxVariant* variant = node->GetData();
     delete variant;
     list.Erase(node);
-    return TRUE;
+    return true;
 }
 
 // Clear list
@@ -1962,21 +1667,62 @@ void wxVariant::ClearList()
     }
     else
     {
-        if (GetType() != wxT("list"))
-        {
-            delete m_data;
-            m_data = NULL;
-        }
+        if (!GetType().IsSameAs(wxT("list")))
+            UnRef();
+
         m_data = new wxVariantDataList;
     }
 }
 
+// Treat a list variant as an array
+wxVariant wxVariant::operator[] (size_t idx) const
+{
+    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") );
+
+    if (GetType() == wxT("list"))
+    {
+        wxVariantDataList* data = (wxVariantDataList*) m_data;
+        wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
+        return *(data->GetValue().Item(idx)->GetData());
+    }
+    return wxNullVariant;
+}
+
+wxVariant& wxVariant::operator[] (size_t idx)
+{
+    // We can't return a reference to a variant for a string list, since the string
+    // is actually stored as a char*, not a variant.
+
+    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
+
+    wxVariantDataList* data = (wxVariantDataList*) m_data;
+    wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
+
+    return * (data->GetValue().Item(idx)->GetData());
+}
+
+// Return the number of elements in a list
+size_t wxVariant::GetCount() const
+{
+    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") );
+
+    if (GetType() == wxT("list"))
+    {
+        wxVariantDataList* data = (wxVariantDataList*) m_data;
+        return data->GetValue().GetCount();
+    }
+    return 0;
+}
+
+// ----------------------------------------------------------------------------
 // Type conversion
+// ----------------------------------------------------------------------------
+
 bool wxVariant::Convert(long* value) const
 {
     wxString type(GetType());
     if (type == wxT("double"))
-        *value = (long) (((wxVariantDataReal*)GetData())->GetValue());
+        *value = (long) (((wxVariantDoubleData*)GetData())->GetValue());
     else if (type == wxT("long"))
         *value = ((wxVariantDataLong*)GetData())->GetValue();
 #ifdef HAVE_BOOL
@@ -1984,18 +1730,18 @@ bool wxVariant::Convert(long* value) const
         *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
 #endif
     else if (type == wxT("string"))
-        *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
+        *value = wxAtol(((wxVariantDataString*)GetData())->GetValue());
     else
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 bool wxVariant::Convert(bool* value) const
 {
     wxString type(GetType());
     if (type == wxT("double"))
-        *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
+        *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0);
     else if (type == wxT("long"))
         *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
 #ifdef HAVE_BOOL
@@ -2006,24 +1752,24 @@ bool wxVariant::Convert(bool* value) const
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();
-        if (val == wxT("true") || val == wxT("yes"))
-            *value = TRUE;
-        else if (val == wxT("false") || val == wxT("no"))
-            *value = FALSE;
+        if (val == wxT("true") || val == wxT("yes") || val == wxT('1') )
+            *value = true;
+        else if (val == wxT("false") || val == wxT("no") || val == wxT('0') )
+            *value = false;
         else
-            return FALSE;
+            return false;
     }
     else
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 bool wxVariant::Convert(double* value) const
 {
     wxString type(GetType());
     if (type == wxT("double"))
-        *value = ((wxVariantDataReal*)GetData())->GetValue();
+        *value = ((wxVariantDoubleData*)GetData())->GetValue();
     else if (type == wxT("long"))
         *value = (double) (((wxVariantDataLong*)GetData())->GetValue());
 #ifdef HAVE_BOOL
@@ -2031,14 +1777,14 @@ bool wxVariant::Convert(double* value) const
         *value = (double) (((wxVariantDataBool*)GetData())->GetValue());
 #endif
     else if (type == wxT("string"))
-        *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
+        *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue());
     else
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
-bool wxVariant::Convert(char* value) const
+bool wxVariant::Convert(wxUniChar* value) const
 {
     wxString type(GetType());
     if (type == wxT("char"))
@@ -2050,15 +1796,33 @@ bool wxVariant::Convert(char* value) const
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
 #endif
     else
-        return FALSE;
+        return false;
+
+    return true;
+}
+
+bool wxVariant::Convert(char* value) const
+{
+    wxUniChar ch;
+    if ( !Convert(&ch) )
+        return false;
+    *value = ch;
+    return true;
+}
 
-    return TRUE;
+bool wxVariant::Convert(wchar_t* value) const
+{
+    wxUniChar ch;
+    if ( !Convert(&ch) )
+        return false;
+    *value = ch;
+    return true;
 }
 
 bool wxVariant::Convert(wxString* value) const
 {
     *value = MakeString();
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_DATETIME
@@ -2068,11 +1832,15 @@ bool wxVariant::Convert(wxDateTime* value) const
     if (type == wxT("datetime"))
     {
         *value = ((wxVariantDataDateTime*)GetData())->GetValue();
-        return TRUE;
+        return true;
     }
     // Fallback to string conversion
     wxString val;
-    return Convert(&val) && (value->ParseDate(val));
+    return Convert(&val) &&
+                (value->ParseDateTime(val.c_str()/*FIXME-UTF8*/) ||
+                 value->ParseDate(val.c_str()/*FIXME-UTF8*/) ||
+                 value->ParseTime(val.c_str()/*FIXME-UTF8*/));
 }
 #endif // wxUSE_DATETIME
 
+#endif // wxUSE_VARIANT