Restore fixes needed for wxRenderer functions to work with wxGCDC.

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 689278480774da6a886ce8ab89dc31c1ec6632ea..6d67625a5f8a5a0d36d819fe8079d6af7e487f93 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -49,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
  */


@@ -62,12 +63,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
 
 wxVariant::wxVariant()
 {
 
 wxVariant::wxVariant()
 {

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

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

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

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


@@ -83,7 +84,7 @@ void wxVariant::Clear()
 wxVariant::wxVariant(const wxVariant& variant)
     : wxObject()
 {
 wxVariant::wxVariant(const wxVariant& variant)
     : wxObject()
 {

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

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


@@ -121,6 +122,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()));
 }
 


@@ -129,7 +133,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())


@@ -176,6 +179,30 @@ void wxVariant::UnRef()
     }
 }
 
     }
 }
 

+bool wxVariant::Unshare()
+{
+    if ( m_data && m_data->GetRefCount() > 1 )
+    {
+        // 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;
+}
+

 
 // Returns a string representing the type of the variant,
 // e.g. "string", "bool", "list", "double", "long"
 
 // Returns a string representing the type of the variant,
 // e.g. "string", "bool", "list", "double", "long"


@@ -206,7 +233,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; }


@@ -227,14 +253,14 @@ public:
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 

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

     virtual wxString GetType() const { return wxT("long"); }
 
 protected:
     long m_value;
 };
 
     virtual wxString GetType() const { return wxT("long"); }
 
 protected:
     long m_value;
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
-

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


@@ -357,7 +383,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; }


@@ -380,12 +405,11 @@ public:
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("double"); }
 
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("double"); }
 

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

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

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDoubleData, wxVariantData)
-

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


@@ -493,11 +517,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; }


@@ -520,12 +541,11 @@ public:
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("bool"); }
 
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("bool"); }
 

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

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

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
-

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


@@ -632,21 +652,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


@@ -660,13 +677,12 @@ public:
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("char"); }
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("char"); }

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

 
 protected:
 
 protected:

-    wxChar m_value;
+    wxUniChar m_value;

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
-

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


@@ -679,16 +695,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;
 }
 


@@ -706,7 +720,9 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
 
 {
     wxTextOutputStream s(str);
 

-    s << 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;
 }


@@ -715,7 +731,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;
 }


@@ -723,31 +743,38 @@ 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_data = new wxVariantDataChar(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(char val, const wxString& name)

 {
     m_data = new wxVariantDataChar(val);
     m_name = name;
 }
 
 {
     m_data = new wxVariantDataChar(val);
     m_name = name;
 }
 

-bool wxVariant::operator== (wxChar value) const
+wxVariant::wxVariant(wchar_t val, const wxString& name)

 {
 {

-    wxChar thisValue;
+    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);
 }
 
     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") &&
         m_data->GetRefCount() == 1)
 {
     if (GetType() == wxT("char") &&
         m_data->GetRefCount() == 1)


@@ -759,17 +786,19 @@ void wxVariant::operator= (wxChar value)
         UnRef();
         m_data = new wxVariantDataChar(value);
     }
         UnRef();
         m_data = new wxVariantDataChar(value);
     }

+
+    return *this;

 }
 
 }
 

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

 {
 {

-    wxChar 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);

     }
 }
 
     }
 }
 


@@ -779,7 +808,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; }


@@ -801,6 +829,7 @@ public:
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("string"); }
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("string"); }

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

 
 protected:
     wxString m_value;
 
 protected:
     wxString m_value;


@@ -853,8 +882,6 @@ bool wxVariantDataString::Read(wxString& str)
     return true;
 }
 
     return true;
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
-

 // wxVariant ****
 
 wxVariant::wxVariant(const wxString& val, const wxString& name)
 // wxVariant ****
 
 wxVariant::wxVariant(const wxString& val, const wxString& name)


@@ -863,7 +890,31 @@ wxVariant::wxVariant(const wxString& val, const wxString& name)
     m_name = name;
 }
 
     m_name = name;
 }
 

-wxVariant::wxVariant(const wxChar* val, const wxString& name)
+wxVariant::wxVariant(const char* val, const wxString& name)
+{
+    m_data = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wchar_t* val, const wxString& name)
+{
+    m_data = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wxCStrData& val, const wxString& name)
+{
+    m_data = new wxVariantDataString(val.AsString());
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wxCharBuffer& val, const wxString& name)
+{
+    m_data = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wxWCharBuffer& val, const wxString& name)

 {
     m_data = new wxVariantDataString(wxString(val));
     m_name = name;
 {
     m_data = new wxVariantDataString(wxString(val));
     m_name = name;


@@ -883,7 +934,7 @@ 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") &&
         m_data->GetRefCount() == 1)
 {
     if (GetType() == wxT("string") &&
         m_data->GetRefCount() == 1)


@@ -895,20 +946,7 @@ void wxVariant::operator= (const wxString& value)
         UnRef();
         m_data = new wxVariantDataString(value);
     }
         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));
-    }
+    return *this;

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


@@ -928,7 +966,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; }


@@ -946,20 +983,17 @@ 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() ;

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

-
-    DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData)
-

 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;
 


@@ -968,10 +1002,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;
 }
 


@@ -996,7 +1034,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;
 }
 


@@ -1040,7 +1078,6 @@ void wxVariant::operator= (wxObject* value)
 
 wxObject* wxVariant::GetWxObjectPtr() const
 {
 
 wxObject* wxVariant::GetWxObjectPtr() const
 {

-    wxASSERT(wxIsKindOf(GetData(), wxVariantDataWxObjectPtr));

     return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
 }
 
     return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
 }
 


@@ -1050,7 +1087,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; }


@@ -1068,19 +1104,15 @@ public:
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("void*"); }
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("void*"); }

-    virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
+    virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); }

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

-
-    DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
-

 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;
 


@@ -1137,8 +1169,7 @@ 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_data->GetRefCount() == 1))

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


@@ -1164,20 +1195,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; }


@@ -1192,15 +1212,13 @@ public:
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("datetime"); }
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("datetime"); }

-    virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
+    virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); }

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

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
-

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


@@ -1224,7 +1242,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;
 }
 


@@ -1240,6 +1261,12 @@ bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
 
 bool wxVariantDataDateTime::Read(wxString& str)
 {
 
 bool wxVariantDataDateTime::Read(wxString& str)
 {

+    if ( str == wxS("Invalid") )
+    {
+        m_value = wxInvalidDateTime;
+        return true;
+    }
+

     if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/))
         return false;
     return true;
     if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/))
         return false;
     return true;


@@ -1253,26 +1280,6 @@ wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
     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;


@@ -1301,27 +1308,6 @@ void wxVariant::operator= (const wxDateTime& 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;


@@ -1358,16 +1344,12 @@ public:
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("arrstring"); }
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("arrstring"); }

-    virtual wxVariantData* Clone() { return new wxVariantDataArrayString; }
+    virtual wxVariantData* Clone() const { return new wxVariantDataArrayString(m_value); }

 
 protected:
     wxArrayString m_value;
 
 protected:
     wxArrayString m_value;

-
-    DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData)
-

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


@@ -1468,14 +1450,13 @@ wxArrayString wxVariant::GetArrayString() const
 
 class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataList)

 public:
     wxVariantDataList() {}
 public:
     wxVariantDataList() {}

-    wxVariantDataList(const wxList& list);
+    wxVariantDataList(const wxVariantList& list);

     virtual ~wxVariantDataList();
 
     virtual ~wxVariantDataList();
 

-    wxList& GetValue() { return m_value; }
-    void SetValue(const wxList& 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


@@ -1490,13 +1471,12 @@ public:
 
     void Clear();
 
 
     void Clear();
 

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

 protected:
 protected:

-    wxList  m_value;
+    wxVariantList  m_value;

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData)
-
-wxVariantDataList::wxVariantDataList(const wxList& list)
+wxVariantDataList::wxVariantDataList(const wxVariantList& list)

 {
     SetValue(list);
 }
 {
     SetValue(list);
 }


@@ -1506,13 +1486,13 @@ wxVariantDataList::~wxVariantDataList()
     Clear();
 }
 
     Clear();
 }
 

-void wxVariantDataList::SetValue(const wxList& value)
+void wxVariantDataList::SetValue(const wxVariantList& value)

 {
     Clear();
 {
     Clear();

-    wxList::compatibility_iterator node = value.GetFirst();
+    wxVariantList::compatibility_iterator node = value.GetFirst();

     while (node)
     {
     while (node)
     {

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

         m_value.Append(new wxVariant(*var));
         node = node->GetNext();
     }
         m_value.Append(new wxVariant(*var));
         node = node->GetNext();
     }


@@ -1520,10 +1500,10 @@ void wxVariantDataList::SetValue(const wxList& value)
 
 void wxVariantDataList::Clear()
 {
 
 void wxVariantDataList::Clear()
 {

-    wxList::compatibility_iterator node = m_value.GetFirst();
+    wxVariantList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

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

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


@@ -1535,12 +1515,12 @@ bool wxVariantDataList::Eq(wxVariantData& data) const
     wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
 
     wxVariantDataList& listData = (wxVariantDataList&) 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();
+    wxVariantList::compatibility_iterator node1 = m_value.GetFirst();
+    wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst();

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

-        wxVariant* var1 = (wxVariant*) node1->GetData();
-        wxVariant* var2 = (wxVariant*) node2->GetData();
+        wxVariant* var1 = node1->GetData();
+        wxVariant* var2 = node2->GetData();

         if ((*var1) != (*var2))
             return false;
         node1 = node1->GetNext();
         if ((*var1) != (*var2))
             return false;
         node1 = node1->GetNext();


@@ -1563,10 +1543,10 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const
 bool wxVariantDataList::Write(wxString& str) const
 {
     str = wxEmptyString;
 bool wxVariantDataList::Write(wxString& str) const
 {
     str = wxEmptyString;

-    wxList::compatibility_iterator node = m_value.GetFirst();
+    wxVariantList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

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

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


@@ -1595,13 +1575,13 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
 
 // wxVariant
 
 
 // wxVariant
 

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

 {
     m_data = new wxVariantDataList(val);
     m_name = name;
 }
 
 {
     m_data = new wxVariantDataList(val);
     m_name = name;
 }
 

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

 {
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
 
 {
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
 


@@ -1609,12 +1589,12 @@ bool wxVariant::operator== (const wxList& value) const
     return (GetData()->Eq(other));
 }
 
     return (GetData()->Eq(other));
 }
 

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

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

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

 {
     if (GetType() == wxT("list") &&
         m_data->GetRefCount() == 1)
 {
     if (GetType() == wxT("list") &&
         m_data->GetRefCount() == 1)


@@ -1628,11 +1608,11 @@ void wxVariant::operator= (const wxList& value)
     }
 }
 
     }
 }
 

-wxList& wxVariant::GetList() const
+wxVariantList& wxVariant::GetList() const

 {
     wxASSERT( (GetType() == wxT("list")) );
 
 {
     wxASSERT( (GetType() == wxT("list")) );
 

-    return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
+    return (wxVariantList&) ((wxVariantDataList*) m_data)->GetValue();

 }
 
 // Make empty list
 }
 
 // Make empty list


@@ -1644,7 +1624,7 @@ void wxVariant::NullList()
 // Append to list
 void wxVariant::Append(const wxVariant& value)
 {
 // Append to list
 void wxVariant::Append(const wxVariant& value)
 {

-    wxList& list = GetList();
+    wxVariantList& list = GetList();

 
     list.Append(new wxVariant(value));
 }
 
     list.Append(new wxVariant(value));
 }


@@ -1652,7 +1632,7 @@ void wxVariant::Append(const wxVariant& value)
 // Insert at front of list
 void wxVariant::Insert(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));
 }
 
     list.Insert(new wxVariant(value));
 }


@@ -1660,12 +1640,12 @@ void wxVariant::Insert(const wxVariant& value)
 // Returns true if the variant is a member of the list
 bool wxVariant::Member(const wxVariant& value) const
 {
 // 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)
     {
     while (node)
     {

-        wxVariant* other = (wxVariant*) node->GetData();
+        wxVariant* other = node->GetData();

         if (value == *other)
             return true;
         node = node->GetNext();
         if (value == *other)
             return true;
         node = node->GetNext();


@@ -1676,11 +1656,11 @@ bool wxVariant::Member(const wxVariant& value) const
 // Deletes the nth element of the list
 bool wxVariant::Delete(size_t item)
 {
 // Deletes the nth element of the list
 bool wxVariant::Delete(size_t item)
 {

-    wxList& list = GetList();
+    wxVariantList& list = GetList();

 
     wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );
 
     wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );

-    wxList::compatibility_iterator node = list.Item(item);
-    wxVariant* variant = (wxVariant*) node->GetData();
+    wxVariantList::compatibility_iterator node = list.Item(item);
+    wxVariant* variant = node->GetData();

     delete variant;
     list.Erase(node);
     return true;
     delete variant;
     list.Erase(node);
     return true;


@@ -1711,7 +1691,7 @@ wxVariant wxVariant::operator[] (size_t idx) const
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );

-        return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
+        return *(data->GetValue().Item(idx)->GetData());

     }
     return wxNullVariant;
 }
     }
     return wxNullVariant;
 }


@@ -1726,7 +1706,7 @@ wxVariant& wxVariant::operator[] (size_t idx)
     wxVariantDataList* data = (wxVariantDataList*) m_data;
     wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
 
     wxVariantDataList* data = (wxVariantDataList*) m_data;
     wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
 

-    return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
+    return * (data->GetValue().Item(idx)->GetData());

 }
 
 // Return the number of elements in a list
 }
 
 // Return the number of elements in a list


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

-#ifdef HAVE_BOOL

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

-#endif

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


@@ -1772,10 +1750,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());


@@ -1800,10 +1776,8 @@ 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"))
         *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue());
     else
     else if (type == wxT("string"))
         *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue());
     else


@@ -1812,23 +1786,39 @@ bool wxVariant::Convert(double* value) const
     return true;
 }
 
     return true;
 }
 

-bool wxVariant::Convert(wxChar* 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
         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();
 bool wxVariant::Convert(wxString* value) const
 {
     *value = MakeString();