Rename wxWebHistoryItem to wxWebViewHistoryItem.

[wxWidgets.git] / src / common / variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 63584d8d396ce114021393672d05f86282b6f061..5f7daabe9a6f5b91d25f3992402a6f6f37c702fc 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/math.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/math.h"

+    #include "wx/crt.h"

     #if wxUSE_STREAMS
         #include "wx/stream.h"
     #endif
     #if wxUSE_STREAMS
         #include "wx/stream.h"
     #endif


@@ -48,11 +49,12 @@ using namespace std ;
 #include "wx/string.h"
 #include "wx/tokenzr.h"
 
 #include "wx/string.h"
 #include "wx/tokenzr.h"
 

-IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
-

 wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 
 wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 

+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxVariantList)
+

 /*
  * wxVariant
  */
 /*
  * wxVariant
  */


@@ -60,13 +62,13 @@ wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
 
 wxVariant::wxVariant()
 IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
 
 wxVariant::wxVariant()

+    : wxObject()

 {
 {

-    m_data = (wxVariantData*) NULL;

 }
 
 bool wxVariant::IsNull() const
 {
 }
 
 bool wxVariant::IsNull() const
 {

-     return (m_data == (wxVariantData*) NULL);
+     return (m_refData == NULL);

 }
 
 void wxVariant::MakeNull()
 }
 
 void wxVariant::MakeNull()


@@ -82,8 +84,6 @@ void wxVariant::Clear()
 wxVariant::wxVariant(const wxVariant& variant)
     : wxObject()
 {
 wxVariant::wxVariant(const wxVariant& variant)
     : wxObject()
 {

-    m_data = (wxVariantData*) NULL;
-

     if (!variant.IsNull())
         Ref(variant);
 
     if (!variant.IsNull())
         Ref(variant);
 


@@ -91,14 +91,26 @@ wxVariant::wxVariant(const wxVariant& variant)
 }
 
 wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data
 }
 
 wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data

+    : wxObject()

 {
 {

-    m_data = data;
+    m_refData = data;

     m_name = name;
 }
 
 wxVariant::~wxVariant()
 {
     m_name = name;
 }
 
 wxVariant::~wxVariant()
 {

-    UnRef();
+}
+
+wxObjectRefData *wxVariant::CreateRefData() const
+{
+    // We cannot create any particular wxVariantData.
+    wxFAIL_MSG("wxVariant::CreateRefData() cannot be implemented");
+    return NULL;
+}
+
+wxObjectRefData *wxVariant::CloneRefData(const wxObjectRefData *data) const
+{
+    return ((wxVariantData*) data)->Clone();

 }
 
 // Assignment
 }
 
 // Assignment


@@ -112,7 +124,7 @@ void wxVariant::operator= (const wxVariant& variant)
 void wxVariant::operator= (wxVariantData* variantData)
 {
     UnRef();
 void wxVariant::operator= (wxVariantData* variantData)
 {
     UnRef();

-    m_data = variantData;
+    m_refData = variantData;

 }
 
 bool wxVariant::operator== (const wxVariant& variant) const
 }
 
 bool wxVariant::operator== (const wxVariant& variant) const


@@ -120,6 +132,9 @@ bool wxVariant::operator== (const wxVariant& variant) const
     if (IsNull() || variant.IsNull())
         return (IsNull() == variant.IsNull());
 
     if (IsNull() || variant.IsNull())
         return (IsNull() == variant.IsNull());
 

+    if (GetType() != variant.GetType())
+        return false;
+

     return (GetData()->Eq(* variant.GetData()));
 }
 
     return (GetData()->Eq(* variant.GetData()));
 }
 


@@ -128,7 +143,6 @@ bool wxVariant::operator!= (const wxVariant& variant) const
     return (!(*this == variant));
 }
 
     return (!(*this == variant));
 }
 

-

 wxString wxVariant::MakeString() const
 {
     if (!IsNull())
 wxString wxVariant::MakeString() const
 {
     if (!IsNull())


@@ -143,36 +157,17 @@ wxString wxVariant::MakeString() const
 void wxVariant::SetData(wxVariantData* data)
 {
     UnRef();
 void wxVariant::SetData(wxVariantData* data)
 {
     UnRef();

-    m_data = data;
+    m_refData = data;

 }
 
 }
 

-void wxVariant::Ref(const wxVariant& clone)
+bool wxVariant::Unshare()

 {
 {

-    // nothing to be done
-    if (m_data == clone.m_data)
-        return;
-
-    // delete reference to old data
-    UnRef();
-
-    // reference new data
-    if ( clone.m_data )
-    {
-        m_data = clone.m_data;
-        m_data->m_count++;
-    }
-}
-
+    if ( !m_refData || m_refData->GetRefCount() == 1 )
+        return true;

 
 

-void wxVariant::UnRef()
-{
-    if ( m_data )
-    {
-        wxASSERT_MSG( m_data->m_count > 0, _T("invalid ref data count") );
+    wxObject::UnShare();

 
 

-        m_data->DecRef();
-        m_data = NULL;
-    }
+    return (m_refData && m_refData->GetRefCount() == 1);

 }
 
 
 }
 
 


@@ -198,6 +193,52 @@ bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
     return info ? info->IsKindOf(type) : false ;
 }
 
     return info ? info->IsKindOf(type) : false ;
 }
 

+// -----------------------------------------------------------------
+// wxVariant <-> wxAny conversion code
+// -----------------------------------------------------------------
+
+#if wxUSE_ANY
+
+wxAnyToVariantRegistration::
+    wxAnyToVariantRegistration(wxVariantDataFactory factory)
+        : m_factory(factory)
+{
+    wxPreRegisterAnyToVariant(this);
+}
+
+wxAnyToVariantRegistration::~wxAnyToVariantRegistration()
+{
+}
+
+wxVariant::wxVariant(const wxAny& any)
+    : wxObject()
+{
+    wxVariant variant;
+    if ( !any.GetAs(&variant) )
+    {
+        wxFAIL_MSG("wxAny of this type cannot be converted to wxVariant");
+        return;
+    }
+
+    *this = variant;
+}
+
+wxAny wxVariant::GetAny() const
+{
+    if ( IsNull() )
+        return wxAny();
+
+    wxAny any;
+    wxVariantData* data = GetData();
+
+    if ( data->GetAsAny(&any) )
+        return any;
+
+    // If everything else fails, wrap the whole wxVariantData
+    return wxAny(data);
+}
+
+#endif // wxUSE_ANY

 
 // -----------------------------------------------------------------
 // wxVariantDataLong
 
 // -----------------------------------------------------------------
 // wxVariantDataLong


@@ -205,7 +246,6 @@ bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
 
 class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataLong)

 public:
     wxVariantDataLong() { m_value = 0; }
     wxVariantDataLong(long value) { m_value = value; }
 public:
     wxVariantDataLong() { m_value = 0; }
     wxVariantDataLong(long value) { m_value = value; }


@@ -226,13 +266,32 @@ public:
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
     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"); }
+
+#if wxUSE_ANY
+    // Since wxAny does not have separate type for integers shorter than
+    // longlong, we do not usually implement wxVariant->wxAny conversion
+    // here (but in wxVariantDataLongLong instead).
+  #ifndef wxLongLong_t
+    DECLARE_WXANY_CONVERSION()
+  #else
+    bool GetAsAny(wxAny* any) const
+    {
+        *any = m_value;
+        return true;
+    }
+  #endif
+#endif // wxUSE_ANY

 
 protected:
     long m_value;
 };
 
 
 protected:
     long m_value;
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
+#ifndef wxLongLong_t
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(long, wxVariantDataLong)
+#endif

 
 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {


@@ -286,27 +345,27 @@ bool wxVariantDataLong::Read(wxInputStream& str)
 
 bool wxVariantDataLong::Read(wxString& str)
 {
 
 bool wxVariantDataLong::Read(wxString& str)
 {

-    m_value = wxAtol((const wxChar*) str);
+    m_value = wxAtol(str);

     return true;
 }
 
     return true;
 }
 

-// wxVariant 
+// wxVariant

 
 wxVariant::wxVariant(long val, const wxString& name)
 {
 
 wxVariant::wxVariant(long val, const wxString& name)
 {

-    m_data = new wxVariantDataLong(val);
+    m_refData = new wxVariantDataLong(val);

     m_name = name;
 }
 
 wxVariant::wxVariant(int val, const wxString& name)
 {
     m_name = name;
 }
 
 wxVariant::wxVariant(int val, const wxString& name)
 {

-    m_data = new wxVariantDataLong((long)val);
+    m_refData = new wxVariantDataLong((long)val);

     m_name = name;
 }
 
 wxVariant::wxVariant(short val, const wxString& name)
 {
     m_name = name;
 }
 
 wxVariant::wxVariant(short val, const wxString& name)
 {

-    m_data = new wxVariantDataLong((long)val);
+    m_refData = new wxVariantDataLong((long)val);

     m_name = name;
 }
 
     m_name = name;
 }
 


@@ -327,14 +386,14 @@ bool wxVariant::operator!= (long value) const
 void wxVariant::operator= (long value)
 {
     if (GetType() == wxT("long") &&
 void wxVariant::operator= (long value)
 {
     if (GetType() == wxT("long") &&

-        m_data->GetRefCount() == 1)
+        m_refData->GetRefCount() == 1)

     {
         ((wxVariantDataLong*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();
     {
         ((wxVariantDataLong*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDataLong(value);
+        m_refData = new wxVariantDataLong(value);

     }
 }
 
     }
 }
 


@@ -356,7 +415,6 @@ long wxVariant::GetLong() const
 
 class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDoubleData)

 public:
     wxVariantDoubleData() { m_value = 0.0; }
     wxVariantDoubleData(double value) { m_value = value; }
 public:
     wxVariantDoubleData() { m_value = 0.0; }
     wxVariantDoubleData(double value) { m_value = value; }


@@ -377,13 +435,16 @@ public:
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
     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); }
+
+    DECLARE_WXANY_CONVERSION()

 protected:
     double m_value;
 };
 
 protected:
     double m_value;
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDoubleData, wxVariantData)
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(double, wxVariantDoubleData)

 
 bool wxVariantDoubleData::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDoubleData::Eq(wxVariantData& data) const
 {


@@ -436,7 +497,7 @@ bool wxVariantDoubleData::Read(wxInputStream& str)
 
 bool wxVariantDoubleData::Read(wxString& str)
 {
 
 bool wxVariantDoubleData::Read(wxString& str)
 {

-    m_value = wxAtof((const wxChar*) str);
+    m_value = wxAtof(str);

     return true;
 }
 
     return true;
 }
 


@@ -444,7 +505,7 @@ bool wxVariantDoubleData::Read(wxString& str)
 
 wxVariant::wxVariant(double val, const wxString& name)
 {
 
 wxVariant::wxVariant(double val, const wxString& name)
 {

-    m_data = new wxVariantDoubleData(val);
+    m_refData = new wxVariantDoubleData(val);

     m_name = name;
 }
 
     m_name = name;
 }
 


@@ -465,14 +526,14 @@ bool wxVariant::operator!= (double value) const
 void wxVariant::operator= (double value)
 {
     if (GetType() == wxT("double") &&
 void wxVariant::operator= (double value)
 {
     if (GetType() == wxT("double") &&

-        m_data->GetRefCount() == 1)
+        m_refData->GetRefCount() == 1)

     {
         ((wxVariantDoubleData*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();
     {
         ((wxVariantDoubleData*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDoubleData(value);
+        m_refData = new wxVariantDoubleData(value);

     }
 }
 
     }
 }
 


@@ -492,11 +553,8 @@ double wxVariant::GetDouble() const
 // wxVariantBoolData
 // -----------------------------------------------------------------
 
 // wxVariantBoolData
 // -----------------------------------------------------------------
 

-#ifdef HAVE_BOOL
-

 class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
 {
 class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataBool)

 public:
     wxVariantDataBool() { m_value = 0; }
     wxVariantDataBool(bool value) { m_value = value; }
 public:
     wxVariantDataBool() { m_value = 0; }
     wxVariantDataBool(bool value) { m_value = value; }


@@ -517,13 +575,16 @@ public:
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     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); }
+
+    DECLARE_WXANY_CONVERSION()

 protected:
     bool m_value;
 };
 
 protected:
     bool m_value;
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(bool, wxVariantDataBool)

 
 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {


@@ -579,7 +640,7 @@ bool wxVariantDataBool::Read(wxInputStream& str)
 
 bool wxVariantDataBool::Read(wxString& str)
 {
 
 bool wxVariantDataBool::Read(wxString& str)
 {

-    m_value = (wxAtol((const wxChar*) str) != 0);
+    m_value = (wxAtol(str) != 0);

     return true;
 }
 
     return true;
 }
 


@@ -587,7 +648,7 @@ bool wxVariantDataBool::Read(wxString& str)
 
 wxVariant::wxVariant(bool val, const wxString& name)
 {
 
 wxVariant::wxVariant(bool val, const wxString& name)
 {

-    m_data = new wxVariantDataBool(val);
+    m_refData = new wxVariantDataBool(val);

     m_name = name;
 }
 
     m_name = name;
 }
 


@@ -608,14 +669,14 @@ bool wxVariant::operator!= (bool value) const
 void wxVariant::operator= (bool value)
 {
     if (GetType() == wxT("bool") &&
 void wxVariant::operator= (bool value)
 {
     if (GetType() == wxT("bool") &&

-        m_data->GetRefCount() == 1)
+        m_refData->GetRefCount() == 1)

     {
         ((wxVariantDataBool*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();
     {
         ((wxVariantDataBool*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDataBool(value);
+        m_refData = new wxVariantDataBool(value);

     }
 }
 
     }
 }
 


@@ -631,21 +692,18 @@ bool wxVariant::GetBool() const
     }
 }
 
     }
 }
 

-#endif // HAVE_BOOL
-

 // -----------------------------------------------------------------
 // wxVariantDataChar
 // -----------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
 {
 // -----------------------------------------------------------------
 // wxVariantDataChar
 // -----------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataChar)

 public:
     wxVariantDataChar() { m_value = 0; }
 public:
     wxVariantDataChar() { m_value = 0; }

-    wxVariantDataChar(wxChar value) { m_value = value; }
+    wxVariantDataChar(const wxUniChar& value) { m_value = value; }

 
 

-    inline wxChar GetValue() const { return m_value; }
-    inline void SetValue(wxChar value) { m_value = value; }
+    inline wxUniChar GetValue() const { return m_value; }
+    inline void SetValue(const wxUniChar& value) { m_value = value; }

 
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
 
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM


@@ -658,13 +716,15 @@ public:
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     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); }

 
 

+    DECLARE_WXANY_CONVERSION()

 protected:
 protected:

-    wxChar m_value;
+    wxUniChar m_value;

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxUniChar, wxVariantDataChar)

 
 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {


@@ -678,16 +738,14 @@ bool wxVariantDataChar::Eq(wxVariantData& data) const
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataChar::Write(wxSTD ostream& str) const
 {
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataChar::Write(wxSTD ostream& str) const
 {

-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
+    str << wxString(m_value);

     return true;
 }
 #endif
 
 bool wxVariantDataChar::Write(wxString& str) const
 {
     return true;
 }
 #endif
 
 bool wxVariantDataChar::Write(wxString& str) const
 {

-    str.Printf(wxT("%c"), m_value);
+    str = m_value;

     return true;
 }
 
     return true;
 }
 


@@ -695,7 +753,7 @@ bool wxVariantDataChar::Write(wxString& str) const
 bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));

-    
+

     return false;
 }
 #endif
     return false;
 }
 #endif


@@ -705,7 +763,10 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
 
 {
     wxTextOutputStream s(str);
 

-    s.Write8(m_value);
+    // 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;
 }
 
     return true;
 }
 


@@ -713,7 +774,11 @@ bool wxVariantDataChar::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
 
 {
     wxTextInputStream s(str);
 

-    s >> m_value;
+    // 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;
 }
 
     return true;
 }


@@ -721,53 +786,62 @@ bool wxVariantDataChar::Read(wxInputStream& str)
 
 bool wxVariantDataChar::Read(wxString& str)
 {
 
 bool wxVariantDataChar::Read(wxString& str)
 {

-    m_value = str[size_t(0)];
+    m_value = str[0u];

     return true;
 }
 
     return true;
 }
 

-wxVariant::wxVariant(wxChar val, const wxString& name)
+wxVariant::wxVariant(const wxUniChar& val, const wxString& name)
+{
+    m_refData = new wxVariantDataChar(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(char val, const wxString& name)
+{
+    m_refData = new wxVariantDataChar(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(wchar_t val, const wxString& name)

 {
 {

-    m_data = new wxVariantDataChar(val);
+    m_refData = new wxVariantDataChar(val);

     m_name = name;
 }
 
     m_name = name;
 }
 

-bool wxVariant::operator== (wxChar value) const
+bool wxVariant::operator==(const wxUniChar& value) const

 {
 {

-    char thisValue;
+    wxUniChar thisValue;

     if (!Convert(&thisValue))
         return false;
     else
         return (value == thisValue);
 }
 
     if (!Convert(&thisValue))
         return false;
     else
         return (value == thisValue);
 }
 

-bool wxVariant::operator!= (wxChar value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (wxChar value)
+wxVariant& wxVariant::operator=(const wxUniChar& value)

 {
     if (GetType() == wxT("char") &&
 {
     if (GetType() == wxT("char") &&

-        m_data->GetRefCount() == 1)
+        m_refData->GetRefCount() == 1)

     {
         ((wxVariantDataChar*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();
     {
         ((wxVariantDataChar*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDataChar(value);
+        m_refData = new wxVariantDataChar(value);

     }
     }

+
+    return *this;

 }
 
 }
 

-wxChar wxVariant::GetChar() const
+wxUniChar wxVariant::GetChar() const

 {
 {

-    char value;
+    wxUniChar value;

     if (Convert(& value))
         return value;
     else
     {
         wxFAIL_MSG(wxT("Could not convert to a char"));
     if (Convert(& value))
         return value;
     else
     {
         wxFAIL_MSG(wxT("Could not convert to a char"));

-        return 0;
+        return wxUniChar(0);

     }
 }
 
     }
 }
 


@@ -777,7 +851,6 @@ wxChar wxVariant::GetChar() const
 
 class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataString)

 public:
     wxVariantDataString() { }
     wxVariantDataString(const wxString& value) { m_value = value; }
 public:
     wxVariantDataString() { }
     wxVariantDataString(const wxString& value) { m_value = value; }


@@ -792,18 +865,42 @@ public:
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM

-    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; };
+    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
 #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); }

 
 

+    DECLARE_WXANY_CONVERSION()

 protected:
     wxString m_value;
 };
 
 protected:
     wxString m_value;
 };
 

+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxString, wxVariantDataString)
+
+#if wxUSE_ANY
+// This allows converting string literal wxAnys to string variants
+wxVariantData* wxVariantDataFromConstCharPAny(const wxAny& any)
+{
+    return new wxVariantDataString(wxANY_AS(any, const char*));
+}
+
+wxVariantData* wxVariantDataFromConstWchar_tPAny(const wxAny& any)
+{
+    return new wxVariantDataString(wxANY_AS(any, const wchar_t*));
+}
+
+_REGISTER_WXANY_CONVERSION(const char*,
+                           ConstCharP,
+                           wxVariantDataFromConstCharPAny)
+_REGISTER_WXANY_CONVERSION(const wchar_t*,
+                           ConstWchar_tP,
+                           wxVariantDataFromConstWchar_tPAny)
+#endif
+

 bool wxVariantDataString::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") );
 bool wxVariantDataString::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") );


@@ -851,21 +948,57 @@ bool wxVariantDataString::Read(wxString& str)
     return true;
 }
 
     return true;
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
-

 // wxVariant ****
 // wxVariant ****

- 
+

 wxVariant::wxVariant(const wxString& val, const wxString& name)
 {
 wxVariant::wxVariant(const wxString& val, const wxString& name)
 {

-    m_data = new wxVariantDataString(val);
+    m_refData = new wxVariantDataString(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(const char* val, const wxString& name)
+{
+    m_refData = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wchar_t* val, const wxString& name)
+{
+    m_refData = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wxCStrData& val, const wxString& name)
+{
+    m_refData = new wxVariantDataString(val.AsString());
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wxScopedCharBuffer& val, const wxString& name)
+{
+    m_refData = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wxScopedWCharBuffer& val, const wxString& name)
+{
+    m_refData = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+
+#if wxUSE_STD_STRING
+wxVariant::wxVariant(const std::string& val, const wxString& name)
+{
+    m_refData = new wxVariantDataString(wxString(val));

     m_name = name;
 }
 
     m_name = name;
 }
 

-wxVariant::wxVariant(const wxChar* val, const wxString& name)
+wxVariant::wxVariant(const wxStdWideString& val, const wxString& name)

 {
 {

-    m_data = new wxVariantDataString(wxString(val));
+    m_refData = new wxVariantDataString(wxString(val));

     m_name = name;
 }
     m_name = name;
 }

+#endif // wxUSE_STD_STRING

 
 bool wxVariant::operator== (const wxString& value) const
 {
 
 bool wxVariant::operator== (const wxString& value) const
 {


@@ -881,32 +1014,19 @@ bool wxVariant::operator!= (const wxString& value) const
     return (!((*this) == value));
 }
 
     return (!((*this) == value));
 }
 

-void wxVariant::operator= (const wxString& value)
+wxVariant& wxVariant::operator= (const wxString& value)

 {
     if (GetType() == wxT("string") &&
 {
     if (GetType() == wxT("string") &&

-        m_data->GetRefCount() == 1)
+        m_refData->GetRefCount() == 1)

     {
         ((wxVariantDataString*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();
     {
         ((wxVariantDataString*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDataString(value);
-    }
-}
-
-void wxVariant::operator= (const wxChar* value)
-{
-    if (GetType() == wxT("string") &&
-        m_data->GetRefCount() == 1)
-    {
-        ((wxVariantDataString*)GetData())->SetValue(wxString(value));
-    }
-    else
-    {
-        UnRef();
-        m_data = new wxVariantDataString(wxString(value));
+        m_refData = new wxVariantDataString(value);

     }
     }

+    return *this;

 }
 
 wxString wxVariant::GetString() const
 }
 
 wxString wxVariant::GetString() const


@@ -926,7 +1046,6 @@ wxString wxVariant::GetString() const
 
 class wxVariantDataWxObjectPtr: public wxVariantData
 {
 
 class wxVariantDataWxObjectPtr: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)

 public:
     wxVariantDataWxObjectPtr() { }
     wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }
 public:
     wxVariantDataWxObjectPtr() { }
     wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }


@@ -944,20 +1063,20 @@ public:
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const ;
 #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();
+
+    DECLARE_WXANY_CONVERSION()

 protected:
     wxObject* m_value;
 protected:
     wxObject* m_value;

-
-    DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData)
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxObject*, wxVariantDataWxObjectPtr)

 
 bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
 {
 
 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;
 
 
     wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
 


@@ -966,10 +1085,14 @@ bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
 
 wxString wxVariantDataWxObjectPtr::GetType() 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 = m_value->GetClassInfo()->GetClassName();

+        returnVal += wxT("*");

     }
     }

+

     return returnVal;
 }
 
     return returnVal;
 }
 


@@ -994,7 +1117,7 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
 
 bool wxVariantDataWxObjectPtr::Write(wxString& str) const
 {
 
 bool wxVariantDataWxObjectPtr::Write(wxString& str) const
 {

-    str.Printf(wxT("%s(%p)"), GetType().c_str(), wx_static_cast(void*, m_value));
+    str.Printf(wxT("%s(%p)"), GetType().c_str(), static_cast<void*>(m_value));

     return true;
 }
 
     return true;
 }
 


@@ -1016,7 +1139,7 @@ bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))
 
 wxVariant::wxVariant( wxObject* val, const wxString& name)
 {
 
 wxVariant::wxVariant( wxObject* val, const wxString& name)
 {

-    m_data = new wxVariantDataWxObjectPtr(val);
+    m_refData = new wxVariantDataWxObjectPtr(val);

     m_name = name;
 }
 
     m_name = name;
 }
 


@@ -1033,13 +1156,12 @@ bool wxVariant::operator!= (wxObject* value) const
 void wxVariant::operator= (wxObject* value)
 {
     UnRef();
 void wxVariant::operator= (wxObject* value)
 {
     UnRef();

-    m_data = new wxVariantDataWxObjectPtr(value);
+    m_refData = new wxVariantDataWxObjectPtr(value);

 }
 
 wxObject* wxVariant::GetWxObjectPtr() const
 {
 }
 
 wxObject* wxVariant::GetWxObjectPtr() const
 {

-    wxASSERT(wxIsKindOf(GetData(), wxVariantDataWxObjectPtr));
-    return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
+    return (wxObject*) ((wxVariantDataWxObjectPtr*) m_refData)->GetValue();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1048,7 +1170,6 @@ wxObject* wxVariant::GetWxObjectPtr() const
 
 class wxVariantDataVoidPtr: public wxVariantData
 {
 
 class wxVariantDataVoidPtr: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)

 public:
     wxVariantDataVoidPtr() { }
     wxVariantDataVoidPtr(void* value) { m_value = value; }
 public:
     wxVariantDataVoidPtr() { }
     wxVariantDataVoidPtr(void* value) { m_value = value; }


@@ -1065,20 +1186,19 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
     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; }
+    virtual wxString GetType() const { return wxT("void*"); }
+    virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); }

 
 

+    DECLARE_WXANY_CONVERSION()

 protected:
     void* m_value;
 protected:
     void* m_value;

-
-    DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(void*, wxVariantDataVoidPtr)

 
 bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
+    wxASSERT_MSG( data.GetType() == wxT("void*"), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );

 
     wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 
 
     wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 


@@ -1119,7 +1239,7 @@ bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
 
 wxVariant::wxVariant( void* val, const wxString& name)
 {
 
 wxVariant::wxVariant( void* val, const wxString& name)
 {

-    m_data = new wxVariantDataVoidPtr(val);
+    m_refData = new wxVariantDataVoidPtr(val);

     m_name = name;
 }
 
     m_name = name;
 }
 


@@ -1135,23 +1255,26 @@ bool wxVariant::operator!= (void* value) const
 
 void wxVariant::operator= (void* value)
 {
 
 void wxVariant::operator= (void* value)
 {

-    if (GetType() == wxT("void*") &&
-        m_data->GetRefCount() == 1)
+    if (GetType() == wxT("void*") && (m_refData->GetRefCount() == 1))

     {
         ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();
     {
         ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDataVoidPtr(value);
+        m_refData = new wxVariantDataVoidPtr(value);

     }
 }
 
 void* wxVariant::GetVoidPtr() const
 {
     }
 }
 
 void* wxVariant::GetVoidPtr() const
 {

-    wxASSERT( (GetType() == wxT("void*")) );
+    // handling this specially is convenient when working with COM, see #9873
+    if ( IsNull() )
+        return NULL;

 
 

-    return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
+    wxASSERT( GetType() == wxT("void*") );
+
+    return (void*) ((wxVariantDataVoidPtr*) m_refData)->GetValue();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1162,20 +1285,9 @@ void* wxVariant::GetVoidPtr() const
 
 class wxVariantDataDateTime: public wxVariantData
 {
 
 class wxVariantDataDateTime: public wxVariantData
 {

-    DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
-

 public:
     wxVariantDataDateTime() { }
     wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
 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, (wxDateTime::wxDateTime_t)valptr->fraction ); }
-#endif //ODBC

 
     inline wxDateTime GetValue() const { return m_value; }
     inline void SetValue(const wxDateTime& value) { m_value = value; }
 
     inline wxDateTime GetValue() const { return m_value; }
     inline void SetValue(const wxDateTime& value) { m_value = value; }


@@ -1189,15 +1301,15 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
     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; }
+    virtual wxString GetType() const { return wxT("datetime"); }
+    virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); }

 
 

+    DECLARE_WXANY_CONVERSION()

 protected:
     wxDateTime m_value;
 };
 
 protected:
     wxDateTime m_value;
 };
 

-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxDateTime, wxVariantDataDateTime)

 
 bool wxVariantDataDateTime::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataDateTime::Eq(wxVariantData& data) const
 {


@@ -1222,7 +1334,10 @@ bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
 
 bool wxVariantDataDateTime::Write(wxString& str) const
 {
 
 bool wxVariantDataDateTime::Write(wxString& str) const
 {

-    str = m_value.Format();
+    if ( m_value.IsValid() )
+        str = m_value.Format();
+    else
+        str = wxS("Invalid");

     return true;
 }
 
     return true;
 }
 


@@ -1238,39 +1353,24 @@ bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
 
 bool wxVariantDataDateTime::Read(wxString& str)
 {
 
 bool wxVariantDataDateTime::Read(wxString& str)
 {

-    if(! m_value.ParseDateTime(str))
-        return false;
-    return true;
+    if ( str == wxS("Invalid") )
+    {
+        m_value = wxInvalidDateTime;
+        return true;
+    }
+
+    wxString::const_iterator end;
+    return m_value.ParseDateTime(str, &end) && end == str.end();

 }
 
 // wxVariant
 
 wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
 {
 }
 
 // wxVariant
 
 wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
 {

-    m_data = new wxVariantDataDateTime(val);
+    m_refData = new wxVariantDataDateTime(val);

     m_name = name;
 }
 
     m_name = name;
 }
 

-#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_name = name;
-}
-
-wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDateTime(valptr);
-    m_name = name;
-}
-#endif // wxUSE_ODBC
-

 bool wxVariant::operator== (const wxDateTime& value) const
 {
     wxDateTime thisValue;
 bool wxVariant::operator== (const wxDateTime& value) const
 {
     wxDateTime thisValue;


@@ -1288,38 +1388,17 @@ bool wxVariant::operator!= (const wxDateTime& value) const
 void wxVariant::operator= (const wxDateTime& value)
 {
     if (GetType() == wxT("datetime") &&
 void wxVariant::operator= (const wxDateTime& value)
 {
     if (GetType() == wxT("datetime") &&

-        m_data->GetRefCount() == 1)
+        m_refData->GetRefCount() == 1)

     {
         ((wxVariantDataDateTime*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();
     {
         ((wxVariantDataDateTime*)GetData())->SetValue(value);
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDataDateTime(value);
+        m_refData = new wxVariantDataDateTime(value);

     }
 }
 
     }
 }
 

-#if wxUSE_ODBC
-void wxVariant::operator= (const DATE_STRUCT* value)
-{
-    UnRef();
-    m_data = new wxVariantDataDateTime(value);
-}
-
-void wxVariant::operator= (const TIME_STRUCT* value)
-{
-    UnRef();
-    m_data = new wxVariantDataDateTime(value);
-}
-
-void wxVariant::operator= (const TIMESTAMP_STRUCT* value)
-{
-    UnRef();
-    m_data = new wxVariantDataDateTime(value);
-}
-
-#endif // wxUSE_ODBC
-

 wxDateTime wxVariant::GetDateTime() const
 {
     wxDateTime value;
 wxDateTime wxVariant::GetDateTime() const
 {
     wxDateTime value;


@@ -1355,16 +1434,15 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
     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("arrstring"); }
+    virtual wxVariantData* Clone() const { return new wxVariantDataArrayString(m_value); }

 
 

+    DECLARE_WXANY_CONVERSION()

 protected:
     wxArrayString m_value;
 protected:
     wxArrayString m_value;

-
-    DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData)
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxArrayString, wxVariantDataArrayString)

 
 bool wxVariantDataArrayString::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataArrayString::Eq(wxVariantData& data) const
 {


@@ -1389,7 +1467,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const
     for ( size_t n = 0; n < count; n++ )
     {
         if ( n )
     for ( size_t n = 0; n < count; n++ )
     {
         if ( n )

-            str += _T(';');
+            str += wxT(';');

 
         str += m_value[n];
     }
 
         str += m_value[n];
     }


@@ -1409,7 +1487,7 @@ bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
 
 bool wxVariantDataArrayString::Read(wxString& str)
 {
 
 bool wxVariantDataArrayString::Read(wxString& str)
 {

-    wxStringTokenizer tk(str, _T(";"));
+    wxStringTokenizer tk(str, wxT(";"));

     while ( tk.HasMoreTokens() )
     {
         m_value.Add(tk.GetNextToken());
     while ( tk.HasMoreTokens() )
     {
         m_value.Add(tk.GetNextToken());


@@ -1422,13 +1500,13 @@ bool wxVariantDataArrayString::Read(wxString& str)
 
 wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
 {
 
 wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
 {

-    m_data = new wxVariantDataArrayString(val);
+    m_refData = new wxVariantDataArrayString(val);

     m_name = name;
 }
 
 bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
 {
     m_name = name;
 }
 
 bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
 {

-    wxFAIL_MSG( _T("TODO") );
+    wxFAIL_MSG( wxT("TODO") );

 
     return false;
 }
 
     return false;
 }


@@ -1441,14 +1519,14 @@ bool wxVariant::operator!=(const wxArrayString& value) const
 void wxVariant::operator=(const wxArrayString& value)
 {
     if (GetType() == wxT("arrstring") &&
 void wxVariant::operator=(const wxArrayString& value)
 {
     if (GetType() == wxT("arrstring") &&

-        m_data->GetRefCount() == 1)
+        m_refData->GetRefCount() == 1)

     {
         ((wxVariantDataArrayString *)GetData())->SetValue(value);
     }
     else
     {
         UnRef();
     {
         ((wxVariantDataArrayString *)GetData())->SetValue(value);
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDataArrayString(value);
+        m_refData = new wxVariantDataArrayString(value);

     }
 }
 
     }
 }
 


@@ -1461,95 +1539,94 @@ wxArrayString wxVariant::GetArrayString() const
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxVariantDataList
+// wxVariantDataLongLong

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
+#if wxUSE_LONGLONG
+
+class WXDLLIMPEXP_BASE wxVariantDataLongLong : public wxVariantData

 {
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataList)

 public:
 public:

-    wxVariantDataList() {}
-    wxVariantDataList(const wxList& list);
-    virtual ~wxVariantDataList();
+    wxVariantDataLongLong() { m_value = 0; }
+    wxVariantDataLongLong(wxLongLong value) { m_value = value; }

 
 

-    wxList& GetValue() { return m_value; }
-    void SetValue(const wxList& value) ;
+    wxLongLong GetValue() const { return m_value; }
+    void SetValue(wxLongLong value) { m_value = value; }

 
     virtual bool Eq(wxVariantData& data) const;
 
     virtual bool Eq(wxVariantData& data) const;

-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
+
+    virtual bool Read(wxString& str);

     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
     virtual bool Read(wxSTD istream& str);
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
     virtual bool Read(wxSTD istream& str);

+    virtual bool Write(wxSTD ostream& str) const;

 #endif
 #endif

-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("list"); };
+#if wxUSE_STREAMS
+    virtual bool Read(wxInputStream& str);
+    virtual bool Write(wxOutputStream &str) const;
+#endif // wxUSE_STREAMS

 
 

-    void Clear();
+    wxVariantData* Clone() const
+    {
+        return new wxVariantDataLongLong(m_value);
+    }
+
+    virtual wxString GetType() const { return wxS("longlong"); }

 
 

+    DECLARE_WXANY_CONVERSION()

 protected:
 protected:

-    wxList  m_value;
+    wxLongLong m_value;

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData)
+//
+// wxLongLong type requires customized wxAny conversion code
+//
+#if wxUSE_ANY
+#ifdef wxLongLong_t

 
 

-wxVariantDataList::wxVariantDataList(const wxList& list)
+bool wxVariantDataLongLong::GetAsAny(wxAny* any) const

 {
 {

-    SetValue(list);
+    *any = m_value.GetValue();
+    return true;

 }
 
 }
 

-wxVariantDataList::~wxVariantDataList()
+wxVariantData* wxVariantDataLongLong::VariantDataFactory(const wxAny& any)

 {
 {

-    Clear();
+    return new wxVariantDataLongLong(wxANY_AS(any, wxLongLong_t));

 }
 
 }
 

-void wxVariantDataList::SetValue(const wxList& value)
+REGISTER_WXANY_CONVERSION(wxLongLong_t, wxVariantDataLongLong)
+
+#else // if !defined(wxLongLong_t)
+
+bool wxVariantDataLongLong::GetAsAny(wxAny* any) const

 {
 {

-    Clear();
-    wxList::compatibility_iterator node = value.GetFirst();
-    while (node)
-    {
-        wxVariant* var = (wxVariant*) node->GetData();
-        m_value.Append(new wxVariant(*var));
-        node = node->GetNext();
-    }
+    *any = m_value;
+    return true;

 }
 
 }
 

-void wxVariantDataList::Clear()
+wxVariantData* wxVariantDataLongLong::VariantDataFactory(const wxAny& any)

 {
 {

-    wxList::compatibility_iterator node = m_value.GetFirst();
-    while (node)
-    {
-        wxVariant* var = (wxVariant*) node->GetData();
-        delete var;
-        node = node->GetNext();
-    }
-    m_value.Clear();
+    return new wxVariantDataLongLong(wxANY_AS(any, wxLongLong));

 }
 
 }
 

-bool wxVariantDataList::Eq(wxVariantData& data) const
+REGISTER_WXANY_CONVERSION(wxLongLong, wxVariantDataLongLong)
+
+#endif // defined(wxLongLong_t)/!defined(wxLongLong_t)
+#endif // wxUSE_ANY
+
+bool wxVariantDataLongLong::Eq(wxVariantData& data) const

 {
 {

-    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
+    wxASSERT_MSG( (data.GetType() == wxS("longlong")),
+                  "wxVariantDataLongLong::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;
+    wxVariantDataLongLong& otherData = (wxVariantDataLongLong&) data;
+
+    return (otherData.m_value == m_value);

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataList::Write(wxSTD ostream& str) const
+bool wxVariantDataLongLong::Write(wxSTD ostream& str) const

 {
     wxString s;
     Write(s);
 {
     wxString s;
     Write(s);


@@ -1558,229 +1635,321 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const
 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataList::Write(wxString& str) const
+bool wxVariantDataLongLong::Write(wxString& str) const

 {
 {

-    str = wxEmptyString;
-    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();
-    }
-
+#ifdef wxLongLong_t
+    str.Printf(wxS("%lld"), m_value.GetValue());

     return true;
     return true;

+#else
+    return false;
+#endif

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataLongLong::Read(wxSTD istream& WXUNUSED(str))

 {
 {

-    wxFAIL_MSG(wxT("Unimplemented"));
-    // TODO
+    wxFAIL_MSG(wxS("Unimplemented"));

     return false;
 }
 #endif
 
     return false;
 }
 #endif
 

-bool wxVariantDataList::Read(wxString& WXUNUSED(str))
+#if wxUSE_STREAMS
+bool wxVariantDataLongLong::Write(wxOutputStream& str) const

 {
 {

-    wxFAIL_MSG(wxT("Unimplemented"));
-    // TODO
-    return false;
+    wxTextOutputStream s(str);
+    s.Write32(m_value.GetLo());
+    s.Write32(m_value.GetHi());
+    return true;

 }
 
 }
 

-// wxVariant
-
-wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants
+bool wxVariantDataLongLong::Read(wxInputStream& str)

 {
 {

-    m_data = new wxVariantDataList(val);
-    m_name = name;
+   wxTextInputStream s(str);
+   unsigned long lo = s.Read32();
+   long hi = s.Read32();
+   m_value = wxLongLong(hi, lo);
+   return true;

 }
 }

+#endif // wxUSE_STREAMS

 
 

-bool wxVariant::operator== (const wxList& value) const
+bool wxVariantDataLongLong::Read(wxString& str)

 {
 {

-    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
+#ifdef wxLongLong_t
+    wxLongLong_t value_t;
+    if ( !str.ToLongLong(&value_t) )
+        return false;
+    m_value = value_t;
+    return true;
+#else
+    return false;
+#endif
+}

 
 

-    wxVariantDataList other(value);
-    return (GetData()->Eq(other));
+// wxVariant
+
+wxVariant::wxVariant(wxLongLong val, const wxString& name)
+{
+    m_refData = new wxVariantDataLongLong(val);
+    m_name = name;

 }
 
 }
 

-bool wxVariant::operator!= (const wxList& value) const
+bool wxVariant::operator==(wxLongLong value) const
+{
+    wxLongLong thisValue;
+    if ( !Convert(&thisValue) )
+        return false;
+    else
+        return (value == thisValue);
+}
+
+bool wxVariant::operator!=(wxLongLong value) const

 {
     return (!((*this) == value));
 }
 
 {
     return (!((*this) == value));
 }
 

-void wxVariant::operator= (const wxList& value)
+void wxVariant::operator=(wxLongLong value)

 {
 {

-    if (GetType() == wxT("list") &&
-        m_data->GetRefCount() == 1)
+    if ( GetType() == wxS("longlong") &&
+         m_refData->GetRefCount() == 1 )

     {
     {

-        ((wxVariantDataList*)GetData())->SetValue(value);
+        ((wxVariantDataLongLong*)GetData())->SetValue(value);

     }
     else
     {
         UnRef();
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDataList(value);
+        m_refData = new wxVariantDataLongLong(value);

     }
 }
 
     }
 }
 

-wxList& wxVariant::GetList() const
+wxLongLong wxVariant::GetLongLong() const

 {
 {

-    wxASSERT( (GetType() == wxT("list")) );
+    wxLongLong value;
+    if ( Convert(&value) )
+    {
+        return value;
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("Could not convert to a long long"));
+        return 0;
+    }
+}
+
+#endif // wxUSE_LONGLONG
+
+// ----------------------------------------------------------------------------
+// wxVariantDataULongLong
+// ----------------------------------------------------------------------------
+
+#if wxUSE_LONGLONG
+
+class WXDLLIMPEXP_BASE wxVariantDataULongLong : public wxVariantData
+{
+public:
+    wxVariantDataULongLong() { m_value = 0; }
+    wxVariantDataULongLong(wxULongLong value) { m_value = value; }
+
+    wxULongLong GetValue() const { return m_value; }
+    void SetValue(wxULongLong value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+
+    virtual bool Read(wxString& str);
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+#if wxUSE_STREAMS
+    virtual bool Read(wxInputStream& str);
+    virtual bool Write(wxOutputStream &str) const;
+#endif // wxUSE_STREAMS
+
+    wxVariantData* Clone() const
+    {
+        return new wxVariantDataULongLong(m_value);
+    }
+
+    virtual wxString GetType() const { return wxS("ulonglong"); }
+
+    DECLARE_WXANY_CONVERSION()
+protected:
+    wxULongLong m_value;
+};
+
+//
+// wxULongLong type requires customized wxAny conversion code
+//
+#if wxUSE_ANY
+#ifdef wxLongLong_t

 
 

-    return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
+bool wxVariantDataULongLong::GetAsAny(wxAny* any) const
+{
+    *any = m_value.GetValue();
+    return true;

 }
 
 }
 

-// Make empty list
-void wxVariant::NullList()
+wxVariantData* wxVariantDataULongLong::VariantDataFactory(const wxAny& any)

 {
 {

-    SetData(new wxVariantDataList());
+    return new wxVariantDataULongLong(wxANY_AS(any, wxULongLong_t));

 }
 
 }
 

-// Append to list
-void wxVariant::Append(const wxVariant& value)
+REGISTER_WXANY_CONVERSION(wxULongLong_t, wxVariantDataULongLong)
+
+#else // if !defined(wxLongLong_t)
+
+bool wxVariantDataULongLong::GetAsAny(wxAny* any) const

 {
 {

-    wxList& list = GetList();
+    *any = m_value;
+    return true;
+}

 
 

-    list.Append(new wxVariant(value));
+wxVariantData* wxVariantDataULongLong::VariantDataFactory(const wxAny& any)
+{
+    return new wxVariantDataULongLong(wxANY_AS(any, wxULongLong));

 }
 
 }
 

-// Insert at front of list
-void wxVariant::Insert(const wxVariant& value)
+REGISTER_WXANY_CONVERSION(wxULongLong, wxVariantDataULongLong)
+
+#endif // defined(wxLongLong_t)/!defined(wxLongLong_t)
+#endif // wxUSE_ANY
+
+
+bool wxVariantDataULongLong::Eq(wxVariantData& data) const

 {
 {

-    wxList& list = GetList();
+    wxASSERT_MSG( (data.GetType() == wxS("ulonglong")),
+                  "wxVariantDataULongLong::Eq: argument mismatch" );

 
 

-    list.Insert(new wxVariant(value));
+    wxVariantDataULongLong& otherData = (wxVariantDataULongLong&) data;
+
+    return (otherData.m_value == m_value);

 }
 
 }
 

-// Returns true if the variant is a member of the list
-bool wxVariant::Member(const wxVariant& value) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataULongLong::Write(wxSTD ostream& str) const

 {
 {

-    wxList& list = GetList();
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif

 
 

-    wxList::compatibility_iterator node = list.GetFirst();
-    while (node)
-    {
-        wxVariant* other = (wxVariant*) node->GetData();
-        if (value == *other)
-            return true;
-        node = node->GetNext();
-    }
+bool wxVariantDataULongLong::Write(wxString& str) const
+{
+#ifdef wxLongLong_t
+    str.Printf(wxS("%llu"), m_value.GetValue());
+    return true;
+#else

     return false;
     return false;

+#endif

 }
 
 }
 

-// Deletes the nth element of the list
-bool wxVariant::Delete(size_t item)
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataULongLong::Read(wxSTD istream& WXUNUSED(str))

 {
 {

-    wxList& list = GetList();
+    wxFAIL_MSG(wxS("Unimplemented"));
+    return false;
+}
+#endif

 
 

-    wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );
-    wxList::compatibility_iterator node = list.Item(item);
-    wxVariant* variant = (wxVariant*) node->GetData();
-    delete variant;
-    list.Erase(node);
+#if wxUSE_STREAMS
+bool wxVariantDataULongLong::Write(wxOutputStream& str) const
+{
+    wxTextOutputStream s(str);
+    s.Write32(m_value.GetLo());
+    s.Write32(m_value.GetHi());

     return true;
 }
 
     return true;
 }
 

-// Clear list
-void wxVariant::ClearList()
+bool wxVariantDataULongLong::Read(wxInputStream& str)

 {
 {

-    if (!IsNull() && (GetType() == wxT("list")))
-    {
-        ((wxVariantDataList*) m_data)->Clear();
-    }
-    else
-    {
-        if (!GetType().IsSameAs(wxT("list")))
-            UnRef();
-
-        m_data = new wxVariantDataList;
-    }
+   wxTextInputStream s(str);
+   unsigned long lo = s.Read32();
+   long hi = s.Read32();
+   m_value = wxULongLong(hi, lo);
+   return true;

 }
 }

+#endif // wxUSE_STREAMS

 
 

-// Treat a list variant as an array
-wxVariant wxVariant::operator[] (size_t idx) const
+bool wxVariantDataULongLong::Read(wxString& str)

 {
 {

-#if WXWIN_COMPATIBILITY_2_4
-    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );
+#ifdef wxLongLong_t
+    wxULongLong_t value_t;
+    if ( !str.ToULongLong(&value_t) )
+        return false;
+    m_value = value_t;
+    return true;

 #else
 #else

-    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") );
+    return false;

 #endif
 #endif

+}

 
 

-    if (GetType() == wxT("list"))
-    {
-        wxVariantDataList* data = (wxVariantDataList*) m_data;
-        wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
-        return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
-    }
-#if WXWIN_COMPATIBILITY_2_4
-    else if (GetType() == wxT("stringlist"))
-    {
-        wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
-        wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
+// wxVariant

 
 

-        wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) );
-        wxVariant variant( str );
-        return variant;
-    }
-#endif
-    return wxNullVariant;
+wxVariant::wxVariant(wxULongLong val, const wxString& name)
+{
+    m_refData = new wxVariantDataULongLong(val);
+    m_name = name;

 }
 
 }
 

-wxVariant& wxVariant::operator[] (size_t idx)
+bool wxVariant::operator==(wxULongLong value) const

 {
 {

-    // 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") );
+    wxULongLong thisValue;
+    if ( !Convert(&thisValue) )
+        return false;
+    else
+        return (value == thisValue);
+}

 
 

-    return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
+bool wxVariant::operator!=(wxULongLong value) const
+{
+    return (!((*this) == value));

 }
 
 }
 

-// Return the number of elements in a list
-size_t wxVariant::GetCount() const
+void wxVariant::operator=(wxULongLong value)

 {
 {

-#if WXWIN_COMPATIBILITY_2_4
-    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") );
-#else
-    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") );
-#endif
+    if ( GetType() == wxS("ulonglong") &&
+         m_refData->GetRefCount() == 1 )
+    {
+        ((wxVariantDataULongLong*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_refData = new wxVariantDataULongLong(value);
+    }
+}

 
 

-    if (GetType() == wxT("list"))
+wxULongLong wxVariant::GetULongLong() const
+{
+    wxULongLong value;
+    if ( Convert(&value) )

     {
     {

-        wxVariantDataList* data = (wxVariantDataList*) m_data;
-        return data->GetValue().GetCount();
+        return value;

     }
     }

-#if WXWIN_COMPATIBILITY_2_4
-    else if (GetType() == wxT("stringlist"))
+    else

     {
     {

-        wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
-        return data->GetValue().GetCount();
+        wxFAIL_MSG(wxT("Could not convert to a long long"));
+        return 0;

     }
     }

-#endif
-    return 0;

 }
 
 }
 

-#if WXWIN_COMPATIBILITY_2_4
+#endif // wxUSE_LONGLONG

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxVariantDataStringList
+// wxVariantDataList

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData

 {
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)

 public:
 public:

-    wxVariantDataStringList() {}
-    wxVariantDataStringList(const wxStringList& list) { m_value = list; }
+    wxVariantDataList() {}
+    wxVariantDataList(const wxVariantList& list);
+    virtual ~wxVariantDataList();

 
 

-    wxStringList& GetValue() const { return (wxStringList&) m_value; }
-    void SetValue(const wxStringList& value);
+    wxVariantList& GetValue() { return m_value; }
+    void SetValue(const wxVariantList& value) ;

 
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
 
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM


@@ -1791,31 +1960,103 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);

-    virtual wxString GetType() const { return wxT("stringlist"); };
+    virtual wxString GetType() const { return wxT("list"); }
+
+    void Clear();

 
 

+    wxVariantData* Clone() const { return new wxVariantDataList(m_value); }
+
+    DECLARE_WXANY_CONVERSION()

 protected:
 protected:

-    wxStringList  m_value;
+    wxVariantList  m_value;

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataStringList, wxVariantData)
+#if wxUSE_ANY
+
+//
+// Convert to/from list of wxAnys
+//

 
 

-void wxVariantDataStringList::SetValue(const wxStringList& value)
+bool wxVariantDataList::GetAsAny(wxAny* any) const

 {
 {

-    m_value = value;
+    wxAnyList dst;
+    wxVariantList::compatibility_iterator node = m_value.GetFirst();
+    while (node)
+    {
+        wxVariant* pVar = node->GetData();
+        dst.push_back(new wxAny(((const wxVariant&)*pVar)));
+        node = node->GetNext();
+    }
+
+    *any = dst;
+    return true;
+}
+
+wxVariantData* wxVariantDataList::VariantDataFactory(const wxAny& any)
+{
+    wxAnyList src = wxANY_AS(any, wxAnyList);
+    wxVariantList dst;
+    wxAnyList::compatibility_iterator node = src.GetFirst();
+    while (node)
+    {
+        wxAny* pAny = node->GetData();
+        dst.push_back(new wxVariant(*pAny));
+        node = node->GetNext();
+    }
+
+    return new wxVariantDataList(dst);

 }
 
 }
 

-bool wxVariantDataStringList::Eq(wxVariantData& data) const
+REGISTER_WXANY_CONVERSION(wxAnyList, wxVariantDataList)
+
+#endif // wxUSE_ANY
+
+wxVariantDataList::wxVariantDataList(const wxVariantList& list)

 {
 {

-    wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
+    SetValue(list);
+}

 
 

-    wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
-    wxStringList::compatibility_iterator node1 = m_value.GetFirst();
-    wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst();
+wxVariantDataList::~wxVariantDataList()
+{
+    Clear();
+}
+
+void wxVariantDataList::SetValue(const wxVariantList& value)
+{
+    Clear();
+    wxVariantList::compatibility_iterator node = value.GetFirst();
+    while (node)
+    {
+        wxVariant* var = node->GetData();
+        m_value.Append(new wxVariant(*var));
+        node = node->GetNext();
+    }
+}
+
+void wxVariantDataList::Clear()
+{
+    wxVariantList::compatibility_iterator node = m_value.GetFirst();
+    while (node)
+    {
+        wxVariant* var = node->GetData();
+        delete var;
+        node = node->GetNext();
+    }
+    m_value.Clear();
+}
+
+bool wxVariantDataList::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
+
+    wxVariantDataList& listData = (wxVariantDataList&) data;
+    wxVariantList::compatibility_iterator node1 = m_value.GetFirst();
+    wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst();

     while (node1 && node2)
     {
     while (node1 && node2)
     {

-        wxString str1 ( node1->GetData() );
-        wxString str2 ( node2->GetData() );
-        if (str1 != str2)
+        wxVariant* var1 = node1->GetData();
+        wxVariant* var2 = node2->GetData();
+        if ((*var1) != (*var2))

             return false;
         node1 = node1->GetNext();
         node2 = node2->GetNext();
             return false;
         node1 = node1->GetNext();
         node2 = node2->GetNext();


@@ -1825,7 +2066,7 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataStringList::Write(wxSTD ostream& str) const
+bool wxVariantDataList::Write(wxSTD ostream& str) const

 {
     wxString s;
     Write(s);
 {
     wxString s;
     Write(s);


@@ -1834,16 +2075,17 @@ bool wxVariantDataStringList::Write(wxSTD ostream& str) const
 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataStringList::Write(wxString& str) const
+bool wxVariantDataList::Write(wxString& str) const

 {
 {

-    str.Empty();
-    wxStringList::compatibility_iterator node = m_value.GetFirst();
+    str = wxEmptyString;
+    wxVariantList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

-        const wxChar* s = node->GetData();
+        wxVariant* var = node->GetData();

         if (node != m_value.GetFirst())
           str += wxT(" ");
         if (node != m_value.GetFirst())
           str += wxT(" ");

-        str += s;
+        wxString str1;
+        str += var->MakeString();

         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 


@@ -1851,7 +2093,7 @@ bool wxVariantDataStringList::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))

 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO


@@ -1859,63 +2101,161 @@ bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
+bool wxVariantDataList::Read(wxString& WXUNUSED(str))

 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
     return false;
 }
 
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
     return false;
 }
 

-#endif //2.4 compat
-
-#if WXWIN_COMPATIBILITY_2_4
+// wxVariant

 
 

-wxVariant::wxVariant(const wxStringList& val, const wxString& name)
+wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants

 {
 {

-    m_data = new wxVariantDataStringList(val);
+    m_refData = new wxVariantDataList(val);

     m_name = name;
 }
 
     m_name = name;
 }
 

-bool wxVariant::operator== (const wxStringList& value) const
+bool wxVariant::operator== (const wxVariantList& value) const

 {
 {

-    wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
+    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );

 
 

-    wxVariantDataStringList other(value);
+    wxVariantDataList other(value);

     return (GetData()->Eq(other));
 }
 
     return (GetData()->Eq(other));
 }
 

-bool wxVariant::operator!= (const wxStringList& value) const
+bool wxVariant::operator!= (const wxVariantList& value) const

 {
 {

-    wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
-
-    wxVariantDataStringList other(value);
-    return !(GetData()->Eq(other));
+    return (!((*this) == value));

 }
 
 }
 

-void wxVariant::operator= (const wxStringList& value)
+void wxVariant::operator= (const wxVariantList& value)

 {
 {

-    if (GetType() == wxT("stringlist") &&
-        m_data->GetRefCount() == 1)
+    if (GetType() == wxT("list") &&
+        m_refData->GetRefCount() == 1)

     {
     {

-        ((wxVariantDataStringList*)GetData())->SetValue(value);
+        ((wxVariantDataList*)GetData())->SetValue(value);

     }
     else
     {
         UnRef();
     }
     else
     {
         UnRef();

-        m_data = new wxVariantDataStringList(value);
+        m_refData = new wxVariantDataList(value);

     }
 }
 
     }
 }
 

-// wxVariant 
+wxVariantList& wxVariant::GetList() const
+{
+    wxASSERT( (GetType() == wxT("list")) );

 
 

-wxStringList& wxVariant::GetStringList() const
+    return (wxVariantList&) ((wxVariantDataList*) m_refData)->GetValue();
+}
+
+// Make empty list
+void wxVariant::NullList()
+{
+    SetData(new wxVariantDataList());
+}
+
+// Append to list
+void wxVariant::Append(const wxVariant& value)

 {
 {

-    wxASSERT( (GetType() == wxT("stringlist")) );
+    wxVariantList& list = GetList();

 
 

-    return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
+    list.Append(new wxVariant(value));

 }
 
 }
 

-#endif
+// Insert at front of list
+void wxVariant::Insert(const wxVariant& value)
+{
+    wxVariantList& list = GetList();
+
+    list.Insert(new wxVariant(value));
+}
+
+// Returns true if the variant is a member of the list
+bool wxVariant::Member(const wxVariant& value) const
+{
+    wxVariantList& list = GetList();
+
+    wxVariantList::compatibility_iterator node = list.GetFirst();
+    while (node)
+    {
+        wxVariant* other = node->GetData();
+        if (value == *other)
+            return true;
+        node = node->GetNext();
+    }
+    return false;
+}
+
+// Deletes the nth element of the list
+bool wxVariant::Delete(size_t item)
+{
+    wxVariantList& list = GetList();
+
+    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;
+}
+
+// Clear list
+void wxVariant::ClearList()
+{
+    if (!IsNull() && (GetType() == wxT("list")))
+    {
+        ((wxVariantDataList*) m_refData)->Clear();
+    }
+    else
+    {
+        if (!GetType().IsSameAs(wxT("list")))
+            UnRef();
+
+        m_refData = 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_refData;
+        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_refData;
+    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_refData;
+        return data->GetValue().GetCount();
+    }
+    return 0;
+}

 
 // ----------------------------------------------------------------------------
 // Type conversion
 
 // ----------------------------------------------------------------------------
 // Type conversion


@@ -1924,16 +2264,32 @@ wxStringList& wxVariant::GetStringList() const
 bool wxVariant::Convert(long* value) const
 {
     wxString type(GetType());
 bool wxVariant::Convert(long* value) const
 {
     wxString type(GetType());

-    if (type == wxT("double"))
+    if (type == wxS("double"))

         *value = (long) (((wxVariantDoubleData*)GetData())->GetValue());
         *value = (long) (((wxVariantDoubleData*)GetData())->GetValue());

-    else if (type == wxT("long"))
+    else if (type == wxS("long"))

         *value = ((wxVariantDataLong*)GetData())->GetValue();
         *value = ((wxVariantDataLong*)GetData())->GetValue();

-#ifdef HAVE_BOOL
-    else if (type == wxT("bool"))
+    else if (type == wxS("bool"))

         *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
         *value = (long) (((wxVariantDataBool*)GetData())->GetValue());

+    else if (type == wxS("string"))
+        *value = wxAtol(((wxVariantDataString*)GetData())->GetValue());
+#if wxUSE_LONGLONG
+    else if (type == wxS("longlong"))
+    {
+        wxLongLong v = ((wxVariantDataLongLong*)GetData())->GetValue();
+        // Don't convert if return value would be vague
+        if ( v < LONG_MIN || v > LONG_MAX )
+            return false;
+        *value = v.ToLong();
+    }
+    else if (type == wxS("ulonglong"))
+    {
+        wxULongLong v = ((wxVariantDataULongLong*)GetData())->GetValue();
+        // Don't convert if return value would be vague
+        if ( v.GetHi() )
+            return false;
+        *value = (long) v.ToULong();
+    }

 #endif
 #endif

-    else if (type == wxT("string"))
-        *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());

     else
         return false;
 
     else
         return false;
 


@@ -1947,10 +2303,8 @@ bool wxVariant::Convert(bool* value) const
         *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0);
     else if (type == wxT("long"))
         *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
         *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0);
     else if (type == wxT("long"))
         *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);

-#ifdef HAVE_BOOL

     else if (type == wxT("bool"))
         *value = ((wxVariantDataBool*)GetData())->GetValue();
     else if (type == wxT("bool"))
         *value = ((wxVariantDataBool*)GetData())->GetValue();

-#endif

     else if (type == wxT("string"))
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
     else if (type == wxT("string"))
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());


@@ -1975,41 +2329,159 @@ bool wxVariant::Convert(double* value) const
         *value = ((wxVariantDoubleData*)GetData())->GetValue();
     else if (type == wxT("long"))
         *value = (double) (((wxVariantDataLong*)GetData())->GetValue());
         *value = ((wxVariantDoubleData*)GetData())->GetValue();
     else if (type == wxT("long"))
         *value = (double) (((wxVariantDataLong*)GetData())->GetValue());

-#ifdef HAVE_BOOL

     else if (type == wxT("bool"))
         *value = (double) (((wxVariantDataBool*)GetData())->GetValue());
     else if (type == wxT("bool"))
         *value = (double) (((wxVariantDataBool*)GetData())->GetValue());

-#endif

     else if (type == wxT("string"))
     else if (type == wxT("string"))

-        *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
+        *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue());
+#if wxUSE_LONGLONG
+    else if (type == wxS("longlong"))
+    {
+        *value = ((wxVariantDataLongLong*)GetData())->GetValue().ToDouble();
+    }
+    else if (type == wxS("ulonglong"))
+    {
+        *value = ((wxVariantDataULongLong*)GetData())->GetValue().ToDouble();
+    }
+#endif

     else
         return false;
 
     return true;
 }
 
     else
         return false;
 
     return true;
 }
 

-bool wxVariant::Convert(char* value) const
+bool wxVariant::Convert(wxUniChar* value) const

 {
     wxString type(GetType());
     if (type == wxT("char"))
         *value = ((wxVariantDataChar*)GetData())->GetValue();
     else if (type == wxT("long"))
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());
 {
     wxString type(GetType());
     if (type == wxT("char"))
         *value = ((wxVariantDataChar*)GetData())->GetValue();
     else if (type == wxT("long"))
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());

-#ifdef HAVE_BOOL

     else if (type == wxT("bool"))
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
     else if (type == wxT("bool"))
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());

-#endif
+    else if (type == wxS("string"))
+    {
+        // Also accept strings of length 1
+        const wxString& str = (((wxVariantDataString*)GetData())->GetValue());
+        if ( str.length() == 1 )
+            *value = str[0];
+        else
+            return false;
+    }

     else
         return false;
 
     return true;
 }
 
     else
         return false;
 
     return true;
 }
 

+bool wxVariant::Convert(char* value) const
+{
+    wxUniChar ch;
+    if ( !Convert(&ch) )
+        return false;
+    *value = ch;
+    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;
 }
 
 bool wxVariant::Convert(wxString* value) const
 {
     *value = MakeString();
     return true;
 }
 

+#if wxUSE_LONGLONG
+bool wxVariant::Convert(wxLongLong* value) const
+{
+    wxString type(GetType());
+    if (type == wxS("longlong"))
+        *value = ((wxVariantDataLongLong*)GetData())->GetValue();
+    else if (type == wxS("long"))
+        *value = ((wxVariantDataLong*)GetData())->GetValue();
+    else if (type == wxS("string"))
+    {
+        wxString s = ((wxVariantDataString*)GetData())->GetValue();
+#ifdef wxLongLong_t
+        wxLongLong_t value_t;
+        if ( !s.ToLongLong(&value_t) )
+            return false;
+        *value = value_t;
+#else
+        long l_value;
+        if ( !s.ToLong(&l_value) )
+            return false;
+        *value = l_value;
+#endif
+    }
+    else if (type == wxS("bool"))
+        *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
+    else if (type == wxS("double"))
+    {
+        value->Assign(((wxVariantDoubleData*)GetData())->GetValue());
+    }
+    else if (type == wxS("ulonglong"))
+        *value = ((wxVariantDataULongLong*)GetData())->GetValue();
+    else
+        return false;
+
+    return true;
+}
+
+bool wxVariant::Convert(wxULongLong* value) const
+{
+    wxString type(GetType());
+    if (type == wxS("ulonglong"))
+        *value = ((wxVariantDataULongLong*)GetData())->GetValue();
+    else if (type == wxS("long"))
+        *value = ((wxVariantDataLong*)GetData())->GetValue();
+    else if (type == wxS("string"))
+    {
+        wxString s = ((wxVariantDataString*)GetData())->GetValue();
+#ifdef wxLongLong_t
+        wxULongLong_t value_t;
+        if ( !s.ToULongLong(&value_t) )
+            return false;
+        *value = value_t;
+#else
+        unsigned long l_value;
+        if ( !s.ToULong(&l_value) )
+            return false;
+        *value = l_value;
+#endif
+    }
+    else if (type == wxS("bool"))
+        *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
+    else if (type == wxS("double"))
+    {
+        double value_d = ((wxVariantDoubleData*)GetData())->GetValue();
+
+        if ( value_d < 0.0 )
+            return false;
+
+#ifdef wxLongLong_t
+        *value = (wxULongLong_t) value_d;
+#else
+        wxLongLong temp;
+        temp.Assign(value_d);
+        *value = temp;
+#endif
+    }
+    else if (type == wxS("longlong"))
+        *value = ((wxVariantDataLongLong*)GetData())->GetValue();
+    else
+        return false;
+
+    return true;
+}
+#endif // wxUSE_LONGLONG
+

 #if wxUSE_DATETIME
 bool wxVariant::Convert(wxDateTime* value) const
 {
 #if wxUSE_DATETIME
 bool wxVariant::Convert(wxDateTime* value) const
 {


@@ -2019,14 +2491,26 @@ bool wxVariant::Convert(wxDateTime* value) const
         *value = ((wxVariantDataDateTime*)GetData())->GetValue();
         return true;
     }
         *value = ((wxVariantDataDateTime*)GetData())->GetValue();
         return true;
     }

+

     // Fallback to string conversion
     wxString val;
     // Fallback to string conversion
     wxString val;

-    return Convert(&val) &&
-                (value->ParseDateTime(val) || value->ParseDate(val) || value->ParseTime(val));
-}
-#endif // wxUSE_DATETIME
+    if ( !Convert(&val) )
+        return false;

 
 

+    // Try to parse this as either date and time, only date or only time
+    // checking that the entire string was parsed
+    wxString::const_iterator end;
+    if ( value->ParseDateTime(val, &end) && end == val.end() )
+        return true;

 
 

+    if ( value->ParseDate(val, &end) && end == val.end() )
+        return true;
+
+    if ( value->ParseTime(val, &end) && end == val.end() )
+        return true;

 
 

+    return false;
+}
+#endif // wxUSE_DATETIME

 
 #endif // wxUSE_VARIANT
 
 #endif // wxUSE_VARIANT