X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f124ddf4502341eb60d41d27da7f24f4ae9fd25c..5429cf245532d124c1309ea956a2845eed195485:/src/common/variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index d2dd9665ba..7afa1c3183 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        variant.cpp
+// Name:        src/common/variant.cpp
 // Purpose:     wxVariant class, container for any type
 // Author:      Julian Smart
 // Modified by:
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "variant.h"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -29,6 +25,7 @@
 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000
+namespace std {}
 using namespace std ;
 #endif
 
@@ -39,18 +36,19 @@ using namespace std ;
 
 #include "wx/string.h"
 #include "wx/tokenzr.h"
+#include "wx/math.h"
 
 #include "wx/variant.h"
 
 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:
@@ -58,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);
@@ -94,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();
@@ -105,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();
@@ -122,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();
@@ -136,19 +134,19 @@ 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();
         wxVariant* var2 = (wxVariant*) node2->GetData();
         if ((*var1) != (*var2))
-            return FALSE;
+            return false;
         node1 = node1->GetNext();
         node2 = node2->GetNext();
     }
-    if (node1 || node2) return FALSE;
-    return TRUE;
+    if (node1 || node2) return false;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -157,14 +155,14 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 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();
@@ -175,7 +173,7 @@ bool wxVariantDataList::Write(wxString& str) const
         node = node->GetNext();
     }
 
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -183,7 +181,7 @@ bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
-    return FALSE;
+    return false;
 }
 #endif
 
@@ -191,14 +189,15 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
-    return FALSE;
+    return false;
 }
+#if WXWIN_COMPATIBILITY_2_4
 
 /*
  * wxVariantDataStringList
  */
 
-class WXDLLEXPORT wxVariantDataStringList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
 public:
@@ -245,19 +244,19 @@ 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() );
         wxString str2 ( node2->GetData() );
         if (str1 != str2)
-            return FALSE;
+            return false;
         node1 = node1->GetNext();
         node2 = node2->GetNext();
     }
-    if (node1 || node2) return FALSE;
-    return TRUE;
+    if (node1 || node2) return false;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -266,24 +265,24 @@ bool wxVariantDataStringList::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 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;
         node = node->GetNext();
     }
 
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -291,7 +290,7 @@ bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
-    return FALSE;
+    return false;
 }
 #endif
 
@@ -299,14 +298,16 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
-    return FALSE;
+    return false;
 }
 
+#endif //2.4 compat
+
 /*
  * wxVariantDataLong
  */
 
-class WXDLLEXPORT wxVariantDataLong: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
 public:
@@ -362,21 +363,21 @@ bool wxVariantDataLong::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataLong::Write(wxString& str) const
 {
     str.Printf(wxT("%ld"), m_value);
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataLong::Read(wxSTD istream& str)
 {
     str >> m_value;
-    return TRUE;
+    return true;
 }
 #endif
 
@@ -386,28 +387,28 @@ bool wxVariantDataLong::Write(wxOutputStream& str) const
     wxTextOutputStream s(str);
 
     s.Write32((size_t)m_value);
-    return TRUE;
+    return true;
 }
 
 bool wxVariantDataLong::Read(wxInputStream& str)
 {
    wxTextInputStream s(str);
    m_value = s.Read32();
-   return TRUE;
+   return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataLong::Read(wxString& str)
 {
     m_value = wxAtol((const wxChar*) str);
-    return TRUE;
+    return true;
 }
 
 /*
  * wxVariantDataReal
  */
 
-class WXDLLEXPORT wxVariantDataReal: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
 public:
@@ -454,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
@@ -463,21 +464,21 @@ bool wxVariantDataReal::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataReal::Write(wxString& str) const
 {
-    str.Printf(wxT("%.4f"), m_value);
-    return TRUE;
+    str.Printf(wxT("%.14g"), m_value);
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataReal::Read(wxSTD istream& str)
 {
     str >> m_value;
-    return TRUE;
+    return true;
 }
 #endif
 
@@ -486,21 +487,21 @@ bool wxVariantDataReal::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
     s.WriteDouble((double)m_value);
-    return TRUE;
+    return true;
 }
 
 bool wxVariantDataReal::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
     m_value = (float)s.ReadDouble();
-    return TRUE;
+    return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataReal::Read(wxString& str)
 {
     m_value = wxAtof((const wxChar*) str);
-    return TRUE;
+    return true;
 }
 
 #ifdef HAVE_BOOL
@@ -508,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:
@@ -564,14 +565,14 @@ bool wxVariantDataBool::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataBool::Write(wxString& str) const
 {
     str.Printf(wxT("%d"), (int) m_value);
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -579,7 +580,7 @@ bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> (long) m_value;
-    return FALSE;
+    return false;
 }
 #endif
 
@@ -589,7 +590,7 @@ bool wxVariantDataBool::Write(wxOutputStream& str) const
     wxTextOutputStream s(str);
 
     s.Write8(m_value);
-    return TRUE;
+    return true;
 }
 
 bool wxVariantDataBool::Read(wxInputStream& str)
@@ -597,14 +598,14 @@ bool wxVariantDataBool::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.Read8() != 0;
-    return TRUE;
+    return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataBool::Read(wxString& str)
 {
     m_value = (wxAtol((const wxChar*) str) != 0);
-    return TRUE;
+    return true;
 }
 #endif // HAVE_BOOL
 
@@ -612,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:
@@ -666,14 +667,14 @@ bool wxVariantDataChar::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataChar::Write(wxString& str) const
 {
     str.Printf(wxT("%c"), m_value);
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -681,7 +682,7 @@ bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> m_value;
-    return FALSE;
+    return false;
 }
 #endif
 
@@ -691,7 +692,7 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const
     wxTextOutputStream s(str);
 
     s.Write8(m_value);
-    return TRUE;
+    return true;
 }
 
 bool wxVariantDataChar::Read(wxInputStream& str)
@@ -699,32 +700,23 @@ bool wxVariantDataChar::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.Read8();
-    return TRUE;
+    return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataChar::Read(wxString& str)
 {
-    m_value = str[(size_t)0];
-    return TRUE;
+    m_value = str.ToAscii()[size_t(0)];
+    return true;
 }
 
 /*
  * 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; }
@@ -774,21 +766,21 @@ bool wxVariantDataString::Eq(wxVariantData& data) const
 bool wxVariantDataString::Write(wxSTD ostream& str) const
 {
     str << (const char*) m_value.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataString::Write(wxString& str) const
 {
     str = m_value;
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataString::Read(wxSTD istream& str)
 {
     str >> m_value;
-    return TRUE;
+    return true;
 }
 #endif
 
@@ -798,7 +790,7 @@ bool wxVariantDataString::Write(wxOutputStream& str) const
   // why doesn't wxOutputStream::operator<< take "const wxString&"
     wxTextOutputStream s(str);
     s.WriteString(m_value);
-    return TRUE;
+    return true;
 }
 
 bool wxVariantDataString::Read(wxInputStream& str)
@@ -806,21 +798,17 @@ bool wxVariantDataString::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.ReadString();
-    return TRUE;
+    return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataString::Read(wxString& str)
 {
     m_value = str;
-    return TRUE;
+    return true;
 }
 
-#if defined(__BORLANDC__) && defined(__WIN16__)
-IMPLEMENT_DYNAMIC_CLASS(wxVariantStringData, wxVariantData)
-#else
 IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
-#endif
 
 /*
  * wxVariantDataVoidPtr
@@ -881,28 +869,28 @@ bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataVoidPtr::Write(wxString& str) const
 {
-    str.Printf(wxT("%ld"), (long) m_value);
-    return TRUE;
+    str.Printf(wxT("%p"), m_value);
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 #endif
 
 bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 
 /*
@@ -932,7 +920,7 @@ public:
     virtual wxString GetType() const ;
     virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }
 
-    virtual wxClassInfo* GetValueClassInfo() ; 
+    virtual wxClassInfo* GetValueClassInfo() ;
 protected:
     wxObject* m_value;
 
@@ -973,8 +961,8 @@ wxString wxVariantDataWxObjectPtr::GetType() const
 wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()
 {
     wxClassInfo* returnVal=NULL;
-    
-    if (m_value) returnVal = m_value->GetClassInfo(); 
+
+    if (m_value) returnVal = m_value->GetClassInfo();
 
     return returnVal;
 }
@@ -985,28 +973,28 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
-    return TRUE;
+    return true;
 }
 #endif
 
 bool wxVariantDataWxObjectPtr::Write(wxString& str) const
 {
-    str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value);
-    return TRUE;
+    str.Printf(wxT("%s(%p)"), GetType().c_str(), m_value);
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 #endif
 
 bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 
 
@@ -1030,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; }
@@ -1077,10 +1065,10 @@ 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;
+    return false;
 }
 #endif
 
@@ -1088,7 +1076,7 @@ bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
 bool wxVariantDataDateTime::Write(wxString& str) const
 {
     str = m_value.Format();
-    return TRUE;
+    return true;
 }
 
 
@@ -1096,7 +1084,7 @@ bool wxVariantDataDateTime::Write(wxString& str) const
 bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 #endif
 
@@ -1104,8 +1092,8 @@ bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
 bool wxVariantDataDateTime::Read(wxString& str)
 {
     if(! m_value.ParseDateTime(str))
-        return FALSE;
-    return TRUE;
+        return false;
+    return true;
 }
 
 #endif // wxUSE_DATETIME
@@ -1165,10 +1153,10 @@ 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;
+    return false;
 }
 #endif
 
@@ -1184,7 +1172,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const
         str += m_value[n];
     }
 
-    return TRUE;
+    return true;
 }
 
 
@@ -1192,7 +1180,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const
 bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
-    return FALSE;
+    return false;
 }
 #endif
 
@@ -1205,7 +1193,7 @@ bool wxVariantDataArrayString::Read(wxString& str)
         m_value.Add(tk.GetNextToken());
     }
 
-    return TRUE;
+    return true;
 }
 
 
@@ -1260,12 +1248,16 @@ 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);
@@ -1274,23 +1266,23 @@ wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variant
 
 wxVariant::wxVariant( void* val, const wxString& name)
 {
-   m_data = new wxVariantDataVoidPtr(val);
-   m_name = name;
+    m_data = new wxVariantDataVoidPtr(val);
+    m_name = name;
 }
 
 wxVariant::wxVariant( wxObject* val, const wxString& name)
 {
-   m_data = new wxVariantDataWxObjectPtr(val);
-   m_name = name;
+    m_data = new wxVariantDataWxObjectPtr(val);
+    m_name = name;
 }
 
 #if wxUSE_DATETIME
 wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
 {
-	m_data = new wxVariantDataDateTime(val);
-	m_name = name;
+    m_data = new wxVariantDataDateTime(val);
+    m_name = name;
 }
-#endif // wxUSE_DATETIME    
+#endif // wxUSE_DATETIME
 
 #if wxUSE_ODBC
 wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
@@ -1399,9 +1391,9 @@ bool wxVariant::operator== (double value) const
 {
     double thisValue;
     if (!Convert(&thisValue))
-        return FALSE;
-    else
-        return (value == thisValue);
+        return false;
+
+    return wxIsSameDouble(value, thisValue);
 }
 
 bool wxVariant::operator!= (double value) const
@@ -1427,7 +1419,7 @@ bool wxVariant::operator== (long value) const
 {
     long thisValue;
     if (!Convert(&thisValue))
-        return FALSE;
+        return false;
     else
         return (value == thisValue);
 }
@@ -1455,7 +1447,7 @@ bool wxVariant::operator== (char value) const
 {
     char thisValue;
     if (!Convert(&thisValue))
-        return FALSE;
+        return false;
     else
         return (value == thisValue);
 }
@@ -1484,7 +1476,7 @@ bool wxVariant::operator== (bool value) const
 {
     bool thisValue;
     if (!Convert(&thisValue))
-        return FALSE;
+        return false;
     else
         return (value == thisValue);
 }
@@ -1513,7 +1505,7 @@ bool wxVariant::operator== (const wxString& value) const
 {
     wxString thisValue;
     if (!Convert(&thisValue))
-        return FALSE;
+        return false;
 
     return value == thisValue;
 }
@@ -1551,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") );
@@ -1561,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)
@@ -1578,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") );
@@ -1634,7 +1633,7 @@ bool wxVariant::operator== (const wxDateTime& value) const
 {
     wxDateTime thisValue;
     if (!Convert(&thisValue))
-        return FALSE;
+        return false;
 
     return value.IsEqualTo(thisValue);
 }
@@ -1689,7 +1688,7 @@ bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
 {
     wxFAIL_MSG( _T("TODO") );
 
-    return FALSE;
+    return false;
 }
 
 bool wxVariant::operator!=(const wxArrayString& value) const
@@ -1722,22 +1721,29 @@ 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"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
-        wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
+        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 < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
+        wxASSERT_MSG( (idx < 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;
 }
 
@@ -1749,26 +1755,32 @@ wxVariant& wxVariant::operator[] (size_t idx)
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
 
     wxVariantDataList* data = (wxVariantDataList*) m_data;
-    wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
+    wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
 
     return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
 }
 
 // Return the number of elements in a list
-int wxVariant::GetCount() const
+size_t 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;
 }
 
@@ -1780,7 +1792,7 @@ wxString wxVariant::MakeString() const
         if (GetData()->Write(str))
             return str;
     }
-    return wxString(wxT(""));
+    return wxEmptyString;
 }
 
 // Accessors
@@ -1793,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())
@@ -1810,7 +1822,7 @@ bool wxVariant::IsType(const wxString& type) const
 
 bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
 {
-    wxClassInfo* info=m_data->GetValueClassInfo(); 
+    wxClassInfo* info=m_data->GetValueClassInfo();
     return info ? info->IsKindOf(type) : false ;
 }
 
@@ -1882,7 +1894,7 @@ void* wxVariant::GetVoidPtr() const
     return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 
-wxObject* wxVariant::GetWxObjectPtr() 
+wxObject* wxVariant::GetWxObjectPtr()
 {
     wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr));
     return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
@@ -1908,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")) );
@@ -1915,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)
@@ -1937,33 +1953,33 @@ void wxVariant::Insert(const wxVariant& value)
     list.Insert(new wxVariant(value));
 }
 
-// Returns TRUE if the variant is a member of the list
+// Returns true if the variant is a member of the list
 bool wxVariant::Member(const wxVariant& value) const
 {
     wxList& list = GetList();
 
-    wxNode* node = list.GetFirst();
+    wxList::compatibility_iterator node = list.GetFirst();
     while (node)
     {
         wxVariant* other = (wxVariant*) node->GetData();
         if (value == *other)
-            return TRUE;
+            return true;
         node = node->GetNext();
     }
-    return FALSE;
+    return false;
 }
 
 // Deletes the nth element of the list
-bool wxVariant::Delete(int item)
+bool wxVariant::Delete(size_t item)
 {
     wxList& list = GetList();
 
-    wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") );
-    wxNode* node = list.Item(item);
+    wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );
+    wxList::compatibility_iterator node = list.Item(item);
     wxVariant* variant = (wxVariant*) node->GetData();
     delete variant;
-    delete node;
-    return TRUE;
+    list.Erase(node);
+    return true;
 }
 
 // Clear list
@@ -1975,7 +1991,7 @@ void wxVariant::ClearList()
     }
     else
     {
-        if (GetType() != wxT("list"))
+        if (!GetType().IsSameAs(wxT("list")))
         {
             delete m_data;
             m_data = NULL;
@@ -1999,9 +2015,9 @@ bool wxVariant::Convert(long* value) const
     else if (type == wxT("string"))
         *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 bool wxVariant::Convert(bool* value) const
@@ -2019,17 +2035,17 @@ bool wxVariant::Convert(bool* value) const
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();
-        if (val == wxT("TRUE") || val == wxT("yes"))
-            *value = TRUE;
-        else if (val == wxT("FALSE") || val == wxT("no"))
-            *value = FALSE;
+        if (val == wxT("true") || val == wxT("yes") || val == wxT('1') )
+            *value = true;
+        else if (val == wxT("false") || val == wxT("no") || val == wxT('0') )
+            *value = false;
         else
-            return FALSE;
+            return false;
     }
     else
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 bool wxVariant::Convert(double* value) const
@@ -2046,9 +2062,9 @@ bool wxVariant::Convert(double* value) const
     else if (type == wxT("string"))
         *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 bool wxVariant::Convert(char* value) const
@@ -2063,15 +2079,15 @@ bool wxVariant::Convert(char* value) const
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
 #endif
     else
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 bool wxVariant::Convert(wxString* value) const
 {
     *value = MakeString();
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_DATETIME
@@ -2081,11 +2097,11 @@ bool wxVariant::Convert(wxDateTime* value) const
     if (type == wxT("datetime"))
     {
         *value = ((wxVariantDataDateTime*)GetData())->GetValue();
-        return TRUE;
+        return true;
     }
     // Fallback to string conversion
     wxString val;
-    return Convert(&val) && (value->ParseDate(val));
+    return Convert(&val) &&
+                (value->ParseDateTime(val) || value->ParseDate(val));
 }
 #endif // wxUSE_DATETIME
-