X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1d4dd7add411ebff1ce4a8d1d992e0e43ee26b1..1c5e12589c56fdc7830453422d7f428f1b00d565:/src/common/variant.cpp?ds=sidebyside

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index c38fef7a8d..b9139f68a9 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -9,12 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "variant.h"
-#pragma implementation "time.h"
-#pragma implementation "date.h"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -30,6 +24,11 @@
     #endif
 #endif
 
+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+namespace std {}
+using namespace std ;
+#endif
+
 #if wxUSE_STREAMS
 #include "wx/stream.h"
 #include "wx/txtstrm.h"
@@ -37,27 +36,19 @@
 
 #include "wx/string.h"
 #include "wx/tokenzr.h"
+#include "wx/math.h"
 
 #include "wx/variant.h"
 
-#if wxUSE_TIMEDATE
-IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
-
-wxTime::tFormat    wxTime::ms_Format    = wxTime::wx12h;
-wxTime::tPrecision wxTime::ms_Precision  = wxTime::wxStdMinSec;
-wxChar             wxTime::ms_bufTime[128];
-#endif
-
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
-wxVariant WXDLLEXPORT wxNullVariant;
+wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 /*
  * wxVariantDataList
  */
 
-class WXDLLEXPORT wxVariantDataList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataList)
 public:
@@ -65,7 +56,7 @@ public:
     wxVariantDataList(const wxList& list);
     ~wxVariantDataList();
 
-    wxList& GetValue() const { return (wxList&) m_value; }
+    wxList& GetValue() { return m_value; }
     void SetValue(const wxList& value) ;
 
     virtual void Copy(wxVariantData& data);
@@ -101,7 +92,7 @@ wxVariantDataList::~wxVariantDataList()
 void wxVariantDataList::SetValue(const wxList& value)
 {
     Clear();
-    wxNode* node = value.GetFirst();
+    wxList::compatibility_iterator node = value.GetFirst();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();
@@ -112,7 +103,7 @@ void wxVariantDataList::SetValue(const wxList& value)
 
 void wxVariantDataList::Clear()
 {
-    wxNode* node = m_value.GetFirst();
+    wxList::compatibility_iterator node = m_value.GetFirst();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();
@@ -129,7 +120,7 @@ void wxVariantDataList::Copy(wxVariantData& data)
     wxVariantDataList& listData = (wxVariantDataList&) data;
 
     listData.Clear();
-    wxNode* node = m_value.GetFirst();
+    wxList::compatibility_iterator node = m_value.GetFirst();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();
@@ -143,8 +134,8 @@ bool wxVariantDataList::Eq(wxVariantData& data) const
     wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
 
     wxVariantDataList& listData = (wxVariantDataList&) data;
-    wxNode* node1 = m_value.GetFirst();
-    wxNode* node2 = listData.GetValue().GetFirst();
+    wxList::compatibility_iterator node1 = m_value.GetFirst();
+    wxList::compatibility_iterator node2 = listData.GetValue().GetFirst();
     while (node1 && node2)
     {
         wxVariant* var1 = (wxVariant*) node1->GetData();
@@ -170,8 +161,8 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const
 
 bool wxVariantDataList::Write(wxString& str) const
 {
-    str = wxT("");
-    wxNode* node = m_value.GetFirst();
+    str = wxEmptyString;
+    wxList::compatibility_iterator node = m_value.GetFirst();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();
@@ -200,12 +191,13 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
     // TODO
     return false;
 }
+#if WXWIN_COMPATIBILITY_2_4
 
 /*
  * wxVariantDataStringList
  */
 
-class WXDLLEXPORT wxVariantDataStringList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
 public:
@@ -252,8 +244,8 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const
     wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
 
     wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
-    wxStringList::Node  *node1 = m_value.GetFirst();
-    wxStringList::Node  *node2 = listData.GetValue().GetFirst();
+    wxStringList::compatibility_iterator node1 = m_value.GetFirst();
+    wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst();
     while (node1 && node2)
     {
         wxString str1 ( node1->GetData() );
@@ -280,10 +272,10 @@ bool wxVariantDataStringList::Write(wxSTD ostream& str) const
 bool wxVariantDataStringList::Write(wxString& str) const
 {
     str.Empty();
-    wxStringList::Node  *node = m_value.GetFirst();
+    wxStringList::compatibility_iterator node = m_value.GetFirst();
     while (node)
     {
-        wxChar* s = node->GetData();
+        const wxChar* s = node->GetData();
         if (node != m_value.GetFirst())
           str += wxT(" ");
         str += s;
@@ -309,11 +301,13 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
     return false;
 }
 
+#endif //2.4 compat
+
 /*
  * wxVariantDataLong
  */
 
-class WXDLLEXPORT wxVariantDataLong: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
 public:
@@ -414,7 +408,7 @@ bool wxVariantDataLong::Read(wxString& str)
  * wxVariantDataReal
  */
 
-class WXDLLEXPORT wxVariantDataReal: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
 public:
@@ -461,7 +455,7 @@ bool wxVariantDataReal::Eq(wxVariantData& data) const
 
     wxVariantDataReal& otherData = (wxVariantDataReal&) data;
 
-    return (otherData.m_value == m_value);
+    return wxIsSameDouble(otherData.m_value, m_value);
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -515,7 +509,7 @@ bool wxVariantDataReal::Read(wxString& str)
  * wxVariantDataBool
  */
 
-class WXDLLEXPORT wxVariantDataBool: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
 public:
@@ -619,7 +613,7 @@ bool wxVariantDataBool::Read(wxString& str)
  * wxVariantDataChar
  */
 
-class WXDLLEXPORT wxVariantDataChar: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
 public:
@@ -712,7 +706,7 @@ bool wxVariantDataChar::Read(wxInputStream& str)
 
 bool wxVariantDataChar::Read(wxString& str)
 {
-    m_value = str[(size_t)0];
+    m_value = str.ToAscii()[size_t(0)];
     return true;
 }
 
@@ -720,18 +714,9 @@ bool wxVariantDataChar::Read(wxString& str)
  * wxVariantDataString
  */
 
-#if defined(__BORLANDC__) && defined(__WIN16__)
-// Change name because of truncation
-#define wxVariantDataString wxVariantStringData
-#endif
-
-class WXDLLEXPORT wxVariantDataString: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
 {
-#if defined(__BORLANDC__) && defined(__WIN16__)
-DECLARE_DYNAMIC_CLASS(wxVariantStringData)
-#else
 DECLARE_DYNAMIC_CLASS(wxVariantDataString)
-#endif
 public:
     wxVariantDataString() { }
     wxVariantDataString(const wxString& value) { m_value = value; }
@@ -823,28 +808,21 @@ bool wxVariantDataString::Read(wxString& str)
     return true;
 }
 
-#if defined(__BORLANDC__) && defined(__WIN16__)
-IMPLEMENT_DYNAMIC_CLASS(wxVariantStringData, wxVariantData)
-#else
 IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
-#endif
 
 /*
- * wxVariantDataTime
+ * wxVariantDataVoidPtr
  */
 
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-
-class wxVariantDataTime: public wxVariantData
+class wxVariantDataVoidPtr: public wxVariantData
 {
- DECLARE_DYNAMIC_CLASS(wxVariantDataTime)
+DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
 public:
-    wxVariantDataTime() { }
-    wxVariantDataTime(const wxTime& value) { m_value = value; }
+    wxVariantDataVoidPtr() { }
+    wxVariantDataVoidPtr(void* value) { m_value = value; }
 
-    inline wxTime GetValue() const { return m_value; }
-    inline void SetValue(const wxTime& value) { m_value = value; }
+    inline void* GetValue() const { return m_value; }
+    inline void SetValue(void* value) { m_value = value; }
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
@@ -856,35 +834,37 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("time"); };
-    virtual wxVariantData* Clone() { return new wxVariantDataTime; }
+    virtual wxString GetType() const { return wxT("void*"); };
+    virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
 
 protected:
-    wxTime m_value;
+    void* m_value;
+
+    DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr)
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData)
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
 
-void wxVariantDataTime::Copy(wxVariantData& data)
+void wxVariantDataVoidPtr::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Copy: Can't copy to this type of data") );
+    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
 
-    wxVariantDataTime& otherData = (wxVariantDataTime&) data;
+    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 
     otherData.m_value = m_value;
 }
 
-bool wxVariantDataTime::Eq(wxVariantData& data) const
+bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Eq: argument mismatch") );
+    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
 
-    wxVariantDataTime& otherData = (wxVariantDataTime&) data;
+    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 
     return (otherData.m_value == m_value);
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataTime::Write(wxSTD ostream& str) const
+bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
 {
     wxString s;
     Write(s);
@@ -893,40 +873,39 @@ bool wxVariantDataTime::Write(wxSTD ostream& str) const
 }
 #endif
 
-bool wxVariantDataTime::Write(wxString& str) const
+bool wxVariantDataVoidPtr::Write(wxString& str) const
 {
-    wxChar*s = m_value.FormatTime();
-    str = s;
+    str.Printf(wxT("%p"), m_value);
     return true;
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataTime::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
     return false;
 }
 #endif
 
-bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
 {
     // Not implemented
     return false;
 }
 
 /*
- * wxVariantDataDate
+ * wxVariantDataWxObjectPtr
  */
 
-class wxVariantDataDate: public wxVariantData
+class wxVariantDataWxObjectPtr: public wxVariantData
 {
- DECLARE_DYNAMIC_CLASS(wxVariantDataDate)
+DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)
 public:
-    wxVariantDataDate() { }
-    wxVariantDataDate(const wxDate& value) { m_value = value; }
+    wxVariantDataWxObjectPtr() { }
+    wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }
 
-    inline wxDate GetValue() const { return m_value; }
-    inline void SetValue(const wxDate& value) { m_value = value; }
+    inline wxObject* GetValue() const { return m_value; }
+    inline void SetValue(wxObject* value) { m_value = value; }
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
@@ -938,120 +917,58 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("date"); };
-    virtual wxVariantData* Clone() { return new wxVariantDataDate; }
+    virtual wxString GetType() const ;
+    virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }
 
+    virtual wxClassInfo* GetValueClassInfo() ;
 protected:
-    wxDate m_value;
+    wxObject* m_value;
+
+    DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr)
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData)
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData)
 
-void wxVariantDataDate::Copy(wxVariantData& data)
+void wxVariantDataWxObjectPtr::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Copy: Can't copy to this type of data") );
+    wxASSERT_MSG(  wxIsKindOf((&data), wxVariantDataWxObjectPtr) ,\
+                   wxT("wxVariantDataWxObjectPtr::Copy: Can't copy to this type of data") \
+                 );
 
-    wxVariantDataDate& otherData = (wxVariantDataDate&) data;
+    wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
 
     otherData.m_value = m_value;
 }
 
-bool wxVariantDataDate::Eq(wxVariantData& data) const
+bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Eq: argument mismatch") );
+    wxASSERT_MSG(   wxIsKindOf((&data), wxVariantDataWxObjectPtr), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );
 
-    wxVariantDataDate& otherData = (wxVariantDataDate&) data;
+    wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
 
     return (otherData.m_value == m_value);
 }
 
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Write(wxSTD ostream& str) const
-{
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDataDate::Write(wxString& str) const
-{
-    str = m_value.FormatDate();
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Read(wxSTD istream& WXUNUSED(str))
-{
-    // Not implemented
-    return false;
-}
-#endif
-
-bool wxVariantDataDate::Read(wxString& WXUNUSED(str))
-{
-    // Not implemented
-    return false;
-}
-#endif
-  // wxUSE_TIMEDATE
-
-/*
- * wxVariantDataVoidPtr
- */
-
-class wxVariantDataVoidPtr: public wxVariantData
-{
-DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
-public:
-    wxVariantDataVoidPtr() { }
-    wxVariantDataVoidPtr(void* value) { m_value = value; }
-
-    inline void* GetValue() const { return m_value; }
-    inline void SetValue(void* value) { m_value = value; }
-
-    virtual void Copy(wxVariantData& data);
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("void*"); };
-    virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
-
-protected:
-    void* m_value;
-
-    DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
-
-void wxVariantDataVoidPtr::Copy(wxVariantData& data)
+wxString wxVariantDataWxObjectPtr::GetType() const
 {
-    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
-
-    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
-
-    otherData.m_value = m_value;
+    wxString returnVal(wxT("wxObject"));
+    if (m_value) {
+        returnVal = m_value->GetClassInfo()->GetClassName();
+    }
+    return returnVal;
 }
 
-bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
+wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()
 {
-    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
+    wxClassInfo* returnVal=NULL;
 
-    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+    if (m_value) returnVal = m_value->GetClassInfo();
 
-    return (otherData.m_value == m_value);
+    return returnVal;
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
+bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
 {
     wxString s;
     Write(s);
@@ -1060,30 +977,33 @@ bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
 }
 #endif
 
-bool wxVariantDataVoidPtr::Write(wxString& str) const
+bool wxVariantDataWxObjectPtr::Write(wxString& str) const
 {
-    str.Printf(wxT("%ld"), (long) m_value);
+    str.Printf(wxT("%s(%p)"), GetType().c_str(), m_value);
     return true;
 }
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
     return false;
 }
 #endif
 
-bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
+bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))
 {
     // Not implemented
     return false;
 }
 
+
 /*
  * wxVariantDataDateTime
  */
 
+#if wxUSE_DATETIME
+
 class wxVariantDataDateTime: public wxVariantData
 {
     DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
@@ -1098,7 +1018,7 @@ public:
         { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); }
     wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr)
         { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year,
-                        valptr->hour, valptr->minute, valptr->second, valptr->fraction ); }
+                        valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); }
 #endif //ODBC
 
     inline wxDateTime GetValue() const { return m_value; }
@@ -1145,7 +1065,7 @@ bool wxVariantDataDateTime::Eq(wxVariantData& data) const
 
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
+bool wxVariantDataDateTime::Write(wxSTD ostream& WXUNUSED(str)) const
 {
     // Not implemented
     return false;
@@ -1176,6 +1096,8 @@ bool wxVariantDataDateTime::Read(wxString& str)
     return true;
 }
 
+#endif // wxUSE_DATETIME
+
 // ----------------------------------------------------------------------------
 // wxVariantDataArrayString
 // ----------------------------------------------------------------------------
@@ -1231,7 +1153,7 @@ bool wxVariantDataArrayString::Eq(wxVariantData& data) const
 
 
 #if wxUSE_STD_IOSTREAM
-bool wxVariantDataArrayString::Write(wxSTD ostream& str) const
+bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(str)) const
 {
     // Not implemented
     return false;
@@ -1326,44 +1248,41 @@ wxVariant::wxVariant(const wxChar* val, const wxString& name)
     m_name = name;
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
 wxVariant::wxVariant(const wxStringList& val, const wxString& name)
 {
     m_data = new wxVariantDataStringList(val);
     m_name = name;
 }
 
+#endif
+
 wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants
 {
     m_data = new wxVariantDataList(val);
     m_name = name;
 }
 
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time
+wxVariant::wxVariant( void* val, const wxString& name)
 {
-    m_data = new wxVariantDataTime(val);
-    m_name = name;
-}
-
-wxVariant::wxVariant(const wxDate& val, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDate(val);
+    m_data = new wxVariantDataVoidPtr(val);
     m_name = name;
 }
-#endif
 
-wxVariant::wxVariant(void* val, const wxString& name) // Void ptr
+wxVariant::wxVariant( wxObject* val, const wxString& name)
 {
-    m_data = new wxVariantDataVoidPtr(val);
+    m_data = new wxVariantDataWxObjectPtr(val);
     m_name = name;
 }
 
+#if wxUSE_DATETIME
 wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
 {
     m_data = new wxVariantDataDateTime(val);
     m_name = name;
 }
+#endif // wxUSE_DATETIME
 
 #if wxUSE_ODBC
 wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
@@ -1473,8 +1392,8 @@ bool wxVariant::operator== (double value) const
     double thisValue;
     if (!Convert(&thisValue))
         return false;
-    else
-        return (value == thisValue);
+
+    return wxIsSameDouble(value, thisValue);
 }
 
 bool wxVariant::operator!= (double value) const
@@ -1624,6 +1543,8 @@ void wxVariant::operator= (const wxChar* value)
     }
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
 bool wxVariant::operator== (const wxStringList& value) const
 {
     wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
@@ -1634,7 +1555,10 @@ bool wxVariant::operator== (const wxStringList& value) const
 
 bool wxVariant::operator!= (const wxStringList& value) const
 {
-    return (!((*this) == value));
+    wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
+
+    wxVariantDataStringList other(value);
+    return !(m_data->Eq(other));
 }
 
 void wxVariant::operator= (const wxStringList& value)
@@ -1651,6 +1575,8 @@ void wxVariant::operator= (const wxStringList& value)
     }
 }
 
+#endif
+
 bool wxVariant::operator== (const wxList& value) const
 {
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
@@ -1678,65 +1604,6 @@ void wxVariant::operator= (const wxList& value)
     }
 }
 
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-bool wxVariant::operator== (const wxTime& value) const
-{
-    wxTime thisValue;
-    if (!Convert(&thisValue))
-        return false;
-
-    return value == thisValue;
-}
-
-bool wxVariant::operator!= (const wxTime& value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxTime& value)
-{
-    if (GetType() == wxT("time"))
-    {
-        ((wxVariantDataTime*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataTime(value);
-    }
-}
-
-bool wxVariant::operator== (const wxDate& value) const
-{
-    wxDate thisValue;
-    if (!Convert(&thisValue))
-        return false;
-
-    return (value == thisValue);
-}
-
-bool wxVariant::operator!= (const wxDate& value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxDate& value)
-{
-    if (GetType() == wxT("date"))
-    {
-        ((wxVariantDataTime*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataDate(value);
-    }
-}
-#endif
-
 bool wxVariant::operator== (void* value) const
 {
     return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
@@ -1761,6 +1628,7 @@ void wxVariant::operator= (void* value)
     }
 }
 
+#if wxUSE_DATETIME
 bool wxVariant::operator== (const wxDateTime& value) const
 {
     wxDateTime thisValue;
@@ -1788,6 +1656,7 @@ void wxVariant::operator= (const wxDateTime& value)
         m_data = new wxVariantDataDateTime(value);
     }
 }
+#endif // wxUSE_DATETIME
 
 #if wxUSE_ODBC
 void wxVariant::operator= (const DATE_STRUCT* value)
@@ -1852,7 +1721,11 @@ wxArrayString wxVariant::GetArrayString() const
 // Treat a list variant as an array
 wxVariant wxVariant::operator[] (size_t idx) const
 {
+#if WXWIN_COMPATIBILITY_2_4
     wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );
+#else
+    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") );
+#endif
 
     if (GetType() == wxT("list"))
     {
@@ -1860,14 +1733,17 @@ wxVariant wxVariant::operator[] (size_t idx) const
         wxASSERT_MSG( (idx < (size_t) 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 < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
 
-        wxVariant variant( wxString( (wxChar*) (data->GetValue().Item(idx)->GetData()) ));
+        wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) );
+        wxVariant variant( str );
         return variant;
     }
+#endif
     return wxNullVariant;
 }
 
@@ -1887,18 +1763,24 @@ wxVariant& wxVariant::operator[] (size_t idx)
 // Return the number of elements in a list
 int wxVariant::GetCount() const
 {
+#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() == wxT("list"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         return data->GetValue().GetCount();
     }
+#if WXWIN_COMPATIBILITY_2_4
     else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
         return data->GetValue().GetCount();
     }
+#endif
     return 0;
 }
 
@@ -1910,7 +1792,7 @@ wxString wxVariant::MakeString() const
         if (GetData()->Write(str))
             return str;
     }
-    return wxString(wxT(""));
+    return wxEmptyString;
 }
 
 // Accessors
@@ -1923,7 +1805,7 @@ void wxVariant::SetData(wxVariantData* data)
 
 
 // Returns a string representing the type of the variant,
-// e.g. "string", "bool", "stringlist", "list", "double", "long"
+// e.g. "string", "bool", "list", "double", "long"
 wxString wxVariant::GetType() const
 {
     if (IsNull())
@@ -1938,6 +1820,12 @@ bool wxVariant::IsType(const wxString& type) const
     return (GetType() == type);
 }
 
+bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
+{
+    wxClassInfo* info=m_data->GetValueClassInfo();
+    return info ? info->IsKindOf(type) : false ;
+}
+
 
 // Value accessors
 double wxVariant::GetReal() const
@@ -1999,31 +1887,6 @@ wxString wxVariant::GetString() const
     return value;
 }
 
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-wxTime wxVariant::GetTime() const
-{
-    wxTime value;
-    if (!Convert(& value))
-    {
-        wxFAIL_MSG(wxT("Could not convert to a time"));
-    }
-
-    return value;
-}
-
-wxDate wxVariant::GetDate() const
-{
-    wxDate value;
-    if (!Convert(& value))
-    {
-        wxFAIL_MSG(wxT("Could not convert to a date"));
-    }
-
-    return value;
-}
-#endif // wxUSE_TIMEDATE
-
 void* wxVariant::GetVoidPtr() const
 {
     wxASSERT( (GetType() == wxT("void*")) );
@@ -2031,6 +1894,13 @@ void* wxVariant::GetVoidPtr() const
     return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 
+wxObject* wxVariant::GetWxObjectPtr()
+{
+    wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr));
+    return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
+}
+
+#if wxUSE_DATETIME
 wxDateTime wxVariant::GetDateTime() const
 {
     wxDateTime value;
@@ -2041,6 +1911,7 @@ wxDateTime wxVariant::GetDateTime() const
 
     return value;
 }
+#endif // wxUSE_DATETIME
 
 wxList& wxVariant::GetList() const
 {
@@ -2049,6 +1920,8 @@ wxList& wxVariant::GetList() const
     return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
 wxStringList& wxVariant::GetStringList() const
 {
     wxASSERT( (GetType() == wxT("stringlist")) );
@@ -2056,11 +1929,13 @@ wxStringList& wxVariant::GetStringList() const
     return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
 }
 
+#endif
+
 // Make empty list
 void wxVariant::NullList()
 {
     SetData(new wxVariantDataList());
-};
+}
 
 // Append to list
 void wxVariant::Append(const wxVariant& value)
@@ -2083,7 +1958,7 @@ bool wxVariant::Member(const wxVariant& value) const
 {
     wxList& list = GetList();
 
-    wxNode* node = list.GetFirst();
+    wxList::compatibility_iterator node = list.GetFirst();
     while (node)
     {
         wxVariant* other = (wxVariant*) node->GetData();
@@ -2100,10 +1975,10 @@ bool wxVariant::Delete(int item)
     wxList& list = GetList();
 
     wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") );
-    wxNode* node = list.Item(item);
+    wxList::compatibility_iterator node = list.Item(item);
     wxVariant* variant = (wxVariant*) node->GetData();
     delete variant;
-    delete node;
+    list.Erase(node);
     return true;
 }
 
@@ -2116,7 +1991,7 @@ void wxVariant::ClearList()
     }
     else
     {
-        if (GetType() != wxT("list"))
+        if (!GetType().IsSameAs(wxT("list")))
         {
             delete m_data;
             m_data = NULL;
@@ -2160,9 +2035,9 @@ bool wxVariant::Convert(bool* value) const
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();
-        if (val == wxT("true") || val == wxT("yes"))
+        if (val == wxT("true") || val == wxT("yes") || val == wxT('1') )
             *value = true;
-        else if (val == wxT("false") || val == wxT("no"))
+        else if (val == wxT("false") || val == wxT("no") || val == wxT('0') )
             *value = false;
         else
             return false;
@@ -2215,33 +2090,7 @@ bool wxVariant::Convert(wxString* value) const
     return true;
 }
 
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-bool wxVariant::Convert(wxTime* value) const
-{
-    wxString type(GetType());
-    if (type == wxT("time"))
-        *value = ((wxVariantDataTime*)GetData())->GetValue();
-    else if (type == wxT("date"))
-        *value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
-    else
-        return false;
-
-    return true;
-}
-
-bool wxVariant::Convert(wxDate* value) const
-{
-    wxString type(GetType());
-    if (type == wxT("date"))
-        *value = ((wxVariantDataDate*)GetData())->GetValue();
-    else
-        return false;
-
-    return true;
-}
-#endif // wxUSE_TIMEDATE
-
+#if wxUSE_DATETIME
 bool wxVariant::Convert(wxDateTime* value) const
 {
     wxString type(GetType());
@@ -2249,8 +2098,11 @@ bool wxVariant::Convert(wxDateTime* value) const
     {
         *value = ((wxVariantDataDateTime*)GetData())->GetValue();
         return true;
-    } 
+    }
     // Fallback to string conversion
     wxString val;
-    return Convert(&val) && (value->ParseDate(val));
+    return Convert(&val) &&
+                (value->ParseDateTime(val) || value->ParseDate(val));
 }
+#endif // wxUSE_DATETIME
+