Fix crash when using a proxy (m_protocol already gets cleaned up via CleanData())

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 3acdd76f4f0a844d043be7facc1df7d9ab6e4c3f..bbfd8f4688d5a0d7880970ccc1a708c7cc528418 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "variant.h"
 #endif
 
 #pragma implementation "variant.h"
 #endif
 


@@ -28,23 +28,30 @@
     #endif
 #endif
 
     #endif
 #endif
 

+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+namespace std {}
+using namespace std ;
+#endif
+

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

+#include "wx/tokenzr.h"
+

 #include "wx/variant.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
 #include "wx/variant.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 

-wxVariant WXDLLEXPORT wxNullVariant;
+wxVariant WXDLLIMPEXP_BASE wxNullVariant;

 
 /*
  * wxVariantDataList
  */
 
 
 /*
  * wxVariantDataList
  */
 

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

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataList)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataList)
 public:


@@ -58,11 +65,11 @@ public:
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM

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

 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM

-    virtual bool Read(istream& str);
+    virtual bool Read(wxSTD istream& str);

 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("list"); };
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("list"); };


@@ -88,23 +95,23 @@ wxVariantDataList::~wxVariantDataList()
 void wxVariantDataList::SetValue(const wxList& value)
 {
     Clear();
 void wxVariantDataList::SetValue(const wxList& value)
 {
     Clear();

-    wxNode* node = value.First();
+    wxList::compatibility_iterator node = value.GetFirst();

     while (node)
     {
     while (node)
     {

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

         m_value.Append(new wxVariant(*var));
         m_value.Append(new wxVariant(*var));

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
 void wxVariantDataList::Clear()
 {
     }
 }
 
 void wxVariantDataList::Clear()
 {

-    wxNode* node = m_value.First();
+    wxList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

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

         delete var;
         delete var;

-        node = node->Next();
+        node = node->GetNext();

     }
     m_value.Clear();
 }
     }
     m_value.Clear();
 }


@@ -116,12 +123,12 @@ void wxVariantDataList::Copy(wxVariantData& data)
     wxVariantDataList& listData = (wxVariantDataList&) data;
 
     listData.Clear();
     wxVariantDataList& listData = (wxVariantDataList&) data;
 
     listData.Clear();

-    wxNode* node = m_value.First();
+    wxList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

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

         listData.m_value.Append(new wxVariant(*var));
         listData.m_value.Append(new wxVariant(*var));

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -130,54 +137,54 @@ 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;

-    wxNode* node1 = m_value.First();
-    wxNode* node2 = listData.GetValue().First();
+    wxList::compatibility_iterator node1 = m_value.GetFirst();
+    wxList::compatibility_iterator node2 = listData.GetValue().GetFirst();

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

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

         if ((*var1) != (*var2))
         if ((*var1) != (*var2))

-            return FALSE;
-        node1 = node1->Next();
-        node2 = node2->Next();
+            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
 }
 
 #if wxUSE_STD_IOSTREAM

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

 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataList::Write(wxString& str) const
 {
 }
 #endif
 
 bool wxVariantDataList::Write(wxString& str) const
 {

-    str = wxT("");
-    wxNode* node = m_value.First();
+    str = wxEmptyString;
+    wxList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxVariant* var = (wxVariant*) node->Data();
-        if (node != m_value.First())
+        wxVariant* var = (wxVariant*) node->GetData();
+        if (node != m_value.GetFirst())

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

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -185,14 +192,15 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO

-    return FALSE;
+    return false;

 }
 }

+#if WXWIN_COMPATIBILITY_2_4

 
 /*
  * wxVariantDataStringList
  */
 
 
 /*
  * wxVariantDataStringList
  */
 

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

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
 public:


@@ -205,11 +213,11 @@ public:
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM

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

 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM

-    virtual bool Read(istream& str);
+    virtual bool Read(wxSTD istream& str);

 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("stringlist"); };
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("stringlist"); };


@@ -239,53 +247,53 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const
     wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
 
     wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
     wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
 
     wxVariantDataStringList& listData = (wxVariantDataStringList&) data;

-    wxNode* node1 = m_value.First();
-    wxNode* node2 = listData.GetValue().First();
+    wxStringList::compatibility_iterator node1 = m_value.GetFirst();
+    wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst();

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

-        wxString str1 ((wxChar*) node1->Data());
-        wxString str2 ((wxChar*) node2->Data());
+        wxString str1 ( node1->GetData() );
+        wxString str2 ( node2->GetData() );

         if (str1 != str2)
         if (str1 != str2)

-            return FALSE;
-        node1 = node1->Next();
-        node2 = node2->Next();
+            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
 }
 
 #if wxUSE_STD_IOSTREAM

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

 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataStringList::Write(wxString& str) const
 {
 }
 #endif
 
 bool wxVariantDataStringList::Write(wxString& str) const
 {

-    str = wxT("");
-    wxNode* node = m_value.First();
+    str.Empty();
+    wxStringList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxChar* s = (wxChar*) node->Data();
-        if (node != m_value.First())
+        const wxChar* s = node->GetData();
+        if (node != m_value.GetFirst())

           str += wxT(" ");
         str += s;
           str += wxT(" ");
         str += s;

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -293,14 +301,16 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO

-    return FALSE;
+    return false;

 }
 
 }
 

+#endif //2.4 compat 
+

 /*
  * wxVariantDataLong
  */
 
 /*
  * wxVariantDataLong
  */
 

-class WXDLLEXPORT wxVariantDataLong: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
 public:


@@ -316,8 +326,8 @@ public:
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM

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

 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);


@@ -351,26 +361,26 @@ bool wxVariantDataLong::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
 {
     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);
 }
 #endif
 
 bool wxVariantDataLong::Write(wxString& str) const
 {
     str.Printf(wxT("%ld"), m_value);

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataLong::Read(istream& str)
+bool wxVariantDataLong::Read(wxSTD istream& str)

 {
     str >> m_value;
 {
     str >> m_value;

-    return TRUE;
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -379,29 +389,29 @@ bool wxVariantDataLong::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
 
 {
     wxTextOutputStream s(str);
 

-    s.Write32(m_value);
-    return TRUE;
+    s.Write32((size_t)m_value);
+    return true;

 }
 
 bool wxVariantDataLong::Read(wxInputStream& str)
 {
    wxTextInputStream s(str);
    m_value = s.Read32();
 }
 
 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);
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataLong::Read(wxString& str)
 {
     m_value = wxAtol((const wxChar*) str);

-    return TRUE;
+    return true;

 }
 
 /*
  * wxVariantDataReal
  */
 
 }
 
 /*
  * wxVariantDataReal
  */
 

-class WXDLLEXPORT wxVariantDataReal: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
 public:


@@ -415,11 +425,11 @@ public:
     virtual bool Eq(wxVariantData& data) const;
     virtual bool Read(wxString& str);
 #if wxUSE_STD_IOSTREAM
     virtual bool Eq(wxVariantData& data) const;
     virtual bool Read(wxString& str);
 #if wxUSE_STD_IOSTREAM

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

 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM

-    virtual bool Read(istream& str);
+    virtual bool Read(wxSTD istream& str);

 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);


@@ -452,26 +462,26 @@ bool wxVariantDataReal::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
 {
     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);
 }
 #endif
 
 bool wxVariantDataReal::Write(wxString& str) const
 {
     str.Printf(wxT("%.4f"), m_value);

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataReal::Read(istream& str)
+bool wxVariantDataReal::Read(wxSTD istream& str)

 {
     str >> m_value;
 {
     str >> m_value;

-    return TRUE;
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -480,21 +490,21 @@ bool wxVariantDataReal::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
     s.WriteDouble((double)m_value);
 {
     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();
 }
 
 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);
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataReal::Read(wxString& str)
 {
     m_value = wxAtof((const wxChar*) str);

-    return TRUE;
+    return true;

 }
 
 #ifdef HAVE_BOOL
 }
 
 #ifdef HAVE_BOOL


@@ -502,7 +512,7 @@ bool wxVariantDataReal::Read(wxString& str)
  * wxVariantDataBool
  */
 
  * wxVariantDataBool
  */
 

-class WXDLLEXPORT wxVariantDataBool: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
 public:


@@ -515,12 +525,12 @@ public:
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM

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

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

-    virtual bool Read(istream& str);
+    virtual bool Read(wxSTD istream& str);

 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);


@@ -553,27 +563,27 @@ bool wxVariantDataBool::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
 {
     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);
 }
 #endif
 
 bool wxVariantDataBool::Write(wxString& str) const
 {
     str.Printf(wxT("%d"), (int) m_value);

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> (long) m_value;
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> (long) m_value;

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -582,8 +592,8 @@ bool wxVariantDataBool::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
 
 {
     wxTextOutputStream s(str);
 

-    s.Write8(m_value); 
-    return TRUE;
+    s.Write8(m_value);
+    return true;

 }
 
 bool wxVariantDataBool::Read(wxInputStream& str)
 }
 
 bool wxVariantDataBool::Read(wxInputStream& str)


@@ -591,14 +601,14 @@ bool wxVariantDataBool::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.Read8() != 0;
     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);
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataBool::Read(wxString& str)
 {
     m_value = (wxAtol((const wxChar*) str) != 0);

-    return TRUE;
+    return true;

 }
 #endif // HAVE_BOOL
 
 }
 #endif // HAVE_BOOL
 


@@ -606,7 +616,7 @@ bool wxVariantDataBool::Read(wxString& str)
  * wxVariantDataChar
  */
 
  * wxVariantDataChar
  */
 

-class WXDLLEXPORT wxVariantDataChar: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
 public:


@@ -619,8 +629,8 @@ public:
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM

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

 #endif
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 #endif
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;


@@ -655,27 +665,27 @@ bool wxVariantDataChar::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
 {
     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);
 }
 #endif
 
 bool wxVariantDataChar::Write(wxString& str) const
 {
     str.Printf(wxT("%c"), m_value);

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> m_value;
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> m_value;

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -685,7 +695,7 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const
     wxTextOutputStream s(str);
 
     s.Write8(m_value);
     wxTextOutputStream s(str);
 
     s.Write8(m_value);

-    return TRUE;
+    return true;

 }
 
 bool wxVariantDataChar::Read(wxInputStream& str)
 }
 
 bool wxVariantDataChar::Read(wxInputStream& str)


@@ -693,32 +703,23 @@ bool wxVariantDataChar::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.Read8();
     wxTextInputStream s(str);
 
     m_value = s.Read8();

-    return TRUE;
+    return true;

 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataChar::Read(wxString& str)
 {
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataChar::Read(wxString& str)
 {

-    m_value = str[(size_t)0];
-    return TRUE;
+    m_value = str.ToAscii()[0u];
+    return true;

 }
 
 /*
  * wxVariantDataString
  */
 
 }
 
 /*
  * 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)
 DECLARE_DYNAMIC_CLASS(wxVariantDataString)

-#endif

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


@@ -729,12 +730,12 @@ public:
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM

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

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

-    virtual bool Read(istream& str);
+    virtual bool Read(wxSTD istream& str);

 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);


@@ -765,24 +766,24 @@ bool wxVariantDataString::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

 {
     str << (const char*) m_value.mb_str();
 {
     str << (const char*) m_value.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataString::Write(wxString& str) const
 {
     str = m_value;
 }
 #endif
 
 bool wxVariantDataString::Write(wxString& str) const
 {
     str = m_value;

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataString::Read(istream& str)
+bool wxVariantDataString::Read(wxSTD istream& str)

 {
     str >> m_value;
 {
     str >> m_value;

-    return TRUE;
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -792,7 +793,7 @@ bool wxVariantDataString::Write(wxOutputStream& str) const
   // why doesn't wxOutputStream::operator<< take "const wxString&"
     wxTextOutputStream s(str);
     s.WriteString(m_value);
   // why doesn't wxOutputStream::operator<< take "const wxString&"
     wxTextOutputStream s(str);
     s.WriteString(m_value);

-    return TRUE;
+    return true;

 }
 
 bool wxVariantDataString::Read(wxInputStream& str)
 }
 
 bool wxVariantDataString::Read(wxInputStream& str)


@@ -800,271 +801,406 @@ bool wxVariantDataString::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.ReadString();
     wxTextInputStream s(str);
 
     m_value = s.ReadString();

-    return TRUE;
+    return true;

 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataString::Read(wxString& str)
 {
     m_value = str;
 }
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)

-#endif

 
 /*
 
 /*

- * wxVariantDataTime
+ * wxVariantDataVoidPtr

  */
 
  */
 

-#if wxUSE_TIMEDATE
-
-class wxVariantDataTime: public wxVariantData
+class wxVariantDataVoidPtr: public wxVariantData

 {
 {

- DECLARE_DYNAMIC_CLASS(wxVariantDataTime)
+DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)

 public:
 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;
 #if wxUSE_STD_IOSTREAM
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM

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

 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM

-    virtual bool Read(istream& str);
+    virtual bool Read(wxSTD istream& str);

 #endif
     virtual bool Read(wxString& 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:
 
 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;
 }
 
 
     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
 
     return (otherData.m_value == m_value);
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataTime::Write(ostream& str) const
+bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const

 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataTime::Write(wxString& str) const
+bool wxVariantDataVoidPtr::Write(wxString& str) const

 {
 {

-    wxChar*s = m_value.FormatTime();
-    str = s;
-    return TRUE;
+    str.Printf(wxT("%ld"), (long) m_value);
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataTime::Read(istream& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 
 /*
 }
 
 /*

- * wxVariantDataDate
+ * wxVariantDataWxObjectPtr

  */
 
  */
 

-class wxVariantDataDate: public wxVariantData
+class wxVariantDataWxObjectPtr: public wxVariantData

 {
 {

- DECLARE_DYNAMIC_CLASS(wxVariantDataDate)
+DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)

 public:
 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;
 #if wxUSE_STD_IOSTREAM
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM

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

 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM

-    virtual bool Read(istream& str);
+    virtual bool Read(wxSTD istream& str);

 #endif
     virtual bool Read(wxString& 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:
 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;
 }
 
 
     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);
 }
 
 
     return (otherData.m_value == m_value);
 }
 

+wxString wxVariantDataWxObjectPtr::GetType() const
+{
+    wxString returnVal(wxT("wxObject"));
+    if (m_value) {
+        returnVal = m_value->GetClassInfo()->GetClassName();
+    }
+    return returnVal;
+}
+
+wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()
+{
+    wxClassInfo* returnVal=NULL;
+
+    if (m_value) returnVal = m_value->GetClassInfo();
+
+    return returnVal;
+}
+

 #if wxUSE_STD_IOSTREAM
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataDate::Write(ostream& str) const
+bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const

 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataDate::Write(wxString& str) const
+bool wxVariantDataWxObjectPtr::Write(wxString& str) const

 {
 {

-    str = m_value.FormatDate();
-    return TRUE;
+    str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value);
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataDate::Read(istream& WXUNUSED(str))
+bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataDate::Read(wxString& WXUNUSED(str))
+bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 }

-#endif
-  // wxUSE_TIMEDATE
+

 
 /*
 
 /*

- * wxVariantDataVoidPtr
+ * wxVariantDataDateTime

  */
 
  */
 

-class wxVariantDataVoidPtr: public wxVariantData
+#if wxUSE_DATETIME
+
+class wxVariantDataDateTime: public wxVariantData

 {
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
-public:
-    wxVariantDataVoidPtr() { }
-    wxVariantDataVoidPtr(void* value) { m_value = value; }
+    DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)

 
 

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

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

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

 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
 #endif
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM

-    virtual bool Read(istream& str);
+    virtual bool Read(wxSTD istream& str);

 #endif
     virtual bool Read(wxString& str);
 #endif
     virtual bool Read(wxString& str);

-    virtual wxString GetType() const { return wxT("void*"); };
-       virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
+    virtual wxString GetType() const { return wxT("datetime"); };
+    virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }

 
 protected:
 
 protected:

-    void* m_value;
+    wxDateTime m_value;

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)

 
 

-void wxVariantDataVoidPtr::Copy(wxVariantData& data)
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
+
+void wxVariantDataDateTime::Copy(wxVariantData& data)

 {
 {

-    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
+    wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Copy: Can't copy to this type of data") );

 
 

-    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+    wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;

 
     otherData.m_value = m_value;
 }
 
 
     otherData.m_value = m_value;
 }
 

-bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
+
+bool wxVariantDataDateTime::Eq(wxVariantData& data) const

 {
 {

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

 
 

-    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+    wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;

 
     return (otherData.m_value == m_value);
 }
 
 
     return (otherData.m_value == m_value);
 }
 

+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
+{
+    // Not implemented
+    return false;
+}
+#endif
+
+
+bool wxVariantDataDateTime::Write(wxString& str) const
+{
+    str = m_value.Format();
+    return true;
+}
+
+

 #if wxUSE_STD_IOSTREAM
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataVoidPtr::Write(ostream& str) const
+bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))

 {
 {

-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return TRUE;
+    // Not implemented
+    return false;

 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataVoidPtr::Write(wxString& str) const
+
+bool wxVariantDataDateTime::Read(wxString& str)

 {
 {

-    str.Printf(wxT("%ld"), (long) m_value);
-    return TRUE;
+    if(! m_value.ParseDateTime(str))
+        return false;
+    return true;
+}
+
+#endif // wxUSE_DATETIME
+
+// ----------------------------------------------------------------------------
+// wxVariantDataArrayString
+// ----------------------------------------------------------------------------
+
+class wxVariantDataArrayString: public wxVariantData
+{
+public:
+    wxVariantDataArrayString() { }
+    wxVariantDataArrayString(const wxArrayString& value) { m_value = value; }
+
+    wxArrayString GetValue() const { return m_value; }
+    void SetValue(const wxArrayString& 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("arrstring"); };
+    virtual wxVariantData* Clone() { return new wxVariantDataArrayString; }
+
+protected:
+    wxArrayString m_value;
+
+    DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData)
+
+void wxVariantDataArrayString::Copy(wxVariantData& data)
+{
+    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Copy: Can't copy to this type of data") );
+
+    wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
+
+    otherData.m_value = m_value;
+}
+
+
+bool wxVariantDataArrayString::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") );
+
+    wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
+
+    return otherData.m_value == m_value;

 }
 
 }
 

+

 #if wxUSE_STD_IOSTREAM
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataVoidPtr::Read(istream& WXUNUSED(str))
+bool wxVariantDataArrayString::Write(wxSTD ostream& str) const

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
+
+bool wxVariantDataArrayString::Write(wxString& str) const
+{
+    size_t count = m_value.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if ( n )
+            str += _T(';');
+
+        str += m_value[n];
+    }
+
+    return true;
+}
+
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;
+}
+#endif
+
+
+bool wxVariantDataArrayString::Read(wxString& str)
+{
+    wxStringTokenizer tk(str, _T(";"));
+    while ( tk.HasMoreTokens() )
+    {
+        m_value.Add(tk.GetNextToken());
+    }
+
+    return true;

 }
 
 
 }
 
 

+

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


@@ -1115,39 +1251,70 @@ wxVariant::wxVariant(const wxChar* val, const wxString& name)
     m_name = 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;
 }
 
 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;
 }
 
 wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants
 {
     m_data = new wxVariantDataList(val);
     m_name = name;
 }
 

-#if wxUSE_TIMEDATE
-wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time
+wxVariant::wxVariant( void* val, const wxString& name)

 {
 {

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

     m_name = name;
 }
 
     m_name = name;
 }
 

-wxVariant::wxVariant(const wxDate& val, const wxString& name) // Date
+wxVariant::wxVariant( wxObject* val, const wxString& name)

 {
 {

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

     m_name = name;
 }
     m_name = name;
 }

-#endif

 
 

-wxVariant::wxVariant(void* val, const wxString& name) // Void ptr
+#if wxUSE_DATETIME
+wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date

 {
 {

-    m_data = new wxVariantDataVoidPtr(val);
+    m_data = new wxVariantDataDateTime(val);
+    m_name = name;
+}
+#endif // wxUSE_DATETIME
+
+#if wxUSE_ODBC
+wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
+{
+    m_data = new wxVariantDataDateTime(valptr);
+    m_name = name;
+}
+
+wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date
+{
+    m_data = new wxVariantDataDateTime(valptr);
+    m_name = name;
+}
+
+wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date
+{
+    m_data = new wxVariantDataDateTime(valptr);
+    m_name = name;
+}
+#endif // wxUSE_ODBC
+
+wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
+{
+    m_data = new wxVariantDataArrayString(val);

     m_name = name;
 }
 
 wxVariant::wxVariant(const wxVariant& variant)
     m_name = name;
 }
 
 wxVariant::wxVariant(const wxVariant& variant)

+    : wxObject()

 {
     if (!variant.IsNull())
     {
 {
     if (!variant.IsNull())
     {


@@ -1194,8 +1361,10 @@ void wxVariant::operator= (const wxVariant& variant)
             delete m_data;
         m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject();
     }
             delete m_data;
         m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject();
     }

-//    GetData()->Copy(* variant.GetData());
+

     variant.GetData()->Copy(* GetData());
     variant.GetData()->Copy(* GetData());

+
+    m_name = variant.m_name;

 }
 
 // Assignment using data, e.g.
 }
 
 // Assignment using data, e.g.


@@ -1225,7 +1394,7 @@ bool wxVariant::operator== (double value) const
 {
     double thisValue;
     if (!Convert(&thisValue))
 {
     double thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

     else
         return (value == thisValue);
 }
     else
         return (value == thisValue);
 }


@@ -1253,7 +1422,7 @@ bool wxVariant::operator== (long value) const
 {
     long thisValue;
     if (!Convert(&thisValue))
 {
     long thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

     else
         return (value == thisValue);
 }
     else
         return (value == thisValue);
 }


@@ -1281,7 +1450,7 @@ bool wxVariant::operator== (char value) const
 {
     char thisValue;
     if (!Convert(&thisValue))
 {
     char thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

     else
         return (value == thisValue);
 }
     else
         return (value == thisValue);
 }


@@ -1310,7 +1479,7 @@ bool wxVariant::operator== (bool value) const
 {
     bool thisValue;
     if (!Convert(&thisValue))
 {
     bool thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

     else
         return (value == thisValue);
 }
     else
         return (value == thisValue);
 }


@@ -1339,9 +1508,9 @@ bool wxVariant::operator== (const wxString& value) const
 {
     wxString thisValue;
     if (!Convert(&thisValue))
 {
     wxString thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
-    else
-        return (value == thisValue);
+        return false;
+
+    return value == thisValue;

 }
 
 bool wxVariant::operator!= (const wxString& value) const
 }
 
 bool wxVariant::operator!= (const wxString& value) const


@@ -1377,6 +1546,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") );
 bool wxVariant::operator== (const wxStringList& value) const
 {
     wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );


@@ -1387,7 +1558,10 @@ bool wxVariant::operator== (const wxStringList& value) const
 
 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)
 }
 
 void wxVariant::operator= (const wxStringList& value)


@@ -1404,6 +1578,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") );
 bool wxVariant::operator== (const wxList& value) const
 {
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );


@@ -1431,107 +1607,146 @@ void wxVariant::operator= (const wxList& value)
     }
 }
 
     }
 }
 

-#if wxUSE_TIMEDATE
-bool wxVariant::operator== (const wxTime& value) const
+bool wxVariant::operator== (void* value) const

 {
 {

-    wxTime thisValue;
-    if (!Convert(&thisValue))
-        return FALSE;
-    else
-        return (value == thisValue);
+    return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());

 }
 
 }
 

-bool wxVariant::operator!= (const wxTime& value) const
+bool wxVariant::operator!= (void* value) const

 {
 {

-    return (!((*this) == value));
+    return (!((*this) == (void*) value));

 }
 
 }
 

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

 {
 {

-    if (GetType() == wxT("time"))
+    if (GetType() == wxT("void*"))

     {
     {

-        ((wxVariantDataTime*)GetData())->SetValue(value);
+        ((wxVariantDataVoidPtr*)GetData())->SetValue(value);

     }
     else
     {
         if (m_data)
             delete m_data;
     }
     else
     {
         if (m_data)
             delete m_data;

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

     }
 }
 
     }
 }
 

-bool wxVariant::operator== (const wxDate& value) const
+#if wxUSE_DATETIME
+bool wxVariant::operator== (const wxDateTime& value) const

 {
 {

-    wxDate thisValue;
+    wxDateTime thisValue;

     if (!Convert(&thisValue))
     if (!Convert(&thisValue))

-        return FALSE;
-    else
-        return (value == thisValue);
+        return false;
+
+    return value.IsEqualTo(thisValue);

 }
 
 }
 

-bool wxVariant::operator!= (const wxDate& value) const
+bool wxVariant::operator!= (const wxDateTime& value) const

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

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

 {
 {

-    if (GetType() == wxT("date"))
+    if (GetType() == wxT("datetime"))

     {
     {

-        ((wxVariantDataTime*)GetData())->SetValue(value);
+        ((wxVariantDataDateTime*)GetData())->SetValue(value);

     }
     else
     {
         if (m_data)
             delete m_data;
     }
     else
     {
         if (m_data)
             delete m_data;

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

     }
 }
     }
 }

-#endif
+#endif // wxUSE_DATETIME

 
 

-bool wxVariant::operator== (void* value) const
+#if wxUSE_ODBC
+void wxVariant::operator= (const DATE_STRUCT* value)

 {
 {

-    return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
+    if (m_data)
+        delete m_data;
+    m_data = new wxVariantDataDateTime(value);

 }
 
 }
 

-bool wxVariant::operator!= (void* value) const
+
+void wxVariant::operator= (const TIME_STRUCT* value)

 {
 {

-    return (!((*this) == value));
+    if (m_data)
+        delete m_data;
+    m_data = new wxVariantDataDateTime(value);

 }
 
 }
 

-void wxVariant::operator= (void* value)
+
+void wxVariant::operator= (const TIMESTAMP_STRUCT* value)

 {
 {

-    if (GetType() == wxT("void*"))
+    if (m_data)
+        delete m_data;
+    m_data = new wxVariantDataDateTime(value);
+}
+
+#endif // wxUSE_ODBC
+
+bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
+{
+    wxFAIL_MSG( _T("TODO") );
+
+    return false;
+}
+
+bool wxVariant::operator!=(const wxArrayString& value) const
+{
+    return !(*this == value);
+}
+
+void wxVariant::operator=(const wxArrayString& value)
+{
+    if (GetType() == wxT("arrstring"))

     {
     {

-        ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
+        ((wxVariantDataArrayString *)GetData())->SetValue(value);

     }
     else
     {
     }
     else
     {

-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataVoidPtr(value);
+        delete m_data;
+        m_data = new wxVariantDataArrayString(value);

     }
 }
 
     }
 }
 

+wxArrayString wxVariant::GetArrayString() const
+{
+    if ( GetType() == wxT("arrstring") )
+        return ((wxVariantDataArrayString *)GetData())->GetValue();
+
+    return wxArrayString();
+}
+
+

 // Treat a list variant as an array
 wxVariant wxVariant::operator[] (size_t idx) 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") );
     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;
 
     if (GetType() == wxT("list"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;

-        wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
-        return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
+        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;
     else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;

-        wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
+        wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );

 
 

-        wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) ));
+        wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) );
+        wxVariant variant( str );

         return variant;
     }
         return variant;
     }

+#endif

     return wxNullVariant;
 }
 
     return wxNullVariant;
 }
 


@@ -1543,26 +1758,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( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
 
     wxVariantDataList* data = (wxVariantDataList*) m_data;

-    wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
+    wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );

 
 

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

 }
 
 // Return the number of elements in a list
 int wxVariant::GetCount() const
 {
 }
 
 // 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()") );
     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;
 
     if (GetType() == wxT("list"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;

-        return data->GetValue().Number();
+        return data->GetValue().GetCount();

     }
     }

+#if WXWIN_COMPATIBILITY_2_4

     else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
     else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;

-        return data->GetValue().Number();
+        return data->GetValue().GetCount();

     }
     }

+#endif

     return 0;
 }
 
     return 0;
 }
 


@@ -1574,7 +1795,7 @@ wxString wxVariant::MakeString() const
         if (GetData()->Write(str))
             return str;
     }
         if (GetData()->Write(str))
             return str;
     }

-    return wxString(wxT(""));
+    return wxEmptyString;

 }
 
 // Accessors
 }
 
 // Accessors


@@ -1587,7 +1808,7 @@ void wxVariant::SetData(wxVariantData* data)
 
 
 // Returns a string representing the type of the variant,
 
 
 // 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())
 wxString wxVariant::GetType() const
 {
     if (IsNull())


@@ -1602,6 +1823,12 @@ bool wxVariant::IsType(const wxString& type) const
     return (GetType() == type);
 }
 
     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
 
 // Value accessors
 double wxVariant::GetReal() const


@@ -1655,47 +1882,39 @@ bool wxVariant::GetBool() const
 wxString wxVariant::GetString() const
 {
     wxString value;
 wxString wxVariant::GetString() const
 {
     wxString value;

-    if (Convert(& value))
-        return value;
-    else
+    if (!Convert(& value))

     {
         wxFAIL_MSG(wxT("Could not convert to a string"));
     {
         wxFAIL_MSG(wxT("Could not convert to a string"));

-        return wxString("");

     }
     }

+
+    return value;

 }
 
 }
 

-#if wxUSE_TIMEDATE
-wxTime wxVariant::GetTime() const
+void* wxVariant::GetVoidPtr() const

 {
 {

-    wxTime value;
-    if (Convert(& value))
-        return value;
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a time"));
-        return wxTime();
-    }
+    wxASSERT( (GetType() == wxT("void*")) );
+
+    return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();

 }
 
 }
 

-wxDate wxVariant::GetDate() const
+wxObject* wxVariant::GetWxObjectPtr()

 {
 {

-    wxDate value;
-    if (Convert(& value))
-        return value;
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a date"));
-        return wxDate();
-    }
+    wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr));
+    return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();

 }
 }

-#endif

 
 

-void* wxVariant::GetVoidPtr() const
+#if wxUSE_DATETIME
+wxDateTime wxVariant::GetDateTime() const

 {
 {

-    wxASSERT( (GetType() == wxT("void*")) );
+    wxDateTime value;
+    if (!Convert(& value))
+    {
+        wxFAIL_MSG(wxT("Could not convert to a datetime"));
+    }

 
 

-    return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
+    return value;

 }
 }

+#endif // wxUSE_DATETIME

 
 wxList& wxVariant::GetList() const
 {
 
 wxList& wxVariant::GetList() const
 {


@@ -1704,6 +1923,8 @@ wxList& wxVariant::GetList() const
     return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
 }
 
     return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+

 wxStringList& wxVariant::GetStringList() const
 {
     wxASSERT( (GetType() == wxT("stringlist")) );
 wxStringList& wxVariant::GetStringList() const
 {
     wxASSERT( (GetType() == wxT("stringlist")) );


@@ -1711,6 +1932,14 @@ wxStringList& wxVariant::GetStringList() const
     return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
 }
 
     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)
 {
 // Append to list
 void wxVariant::Append(const wxVariant& value)
 {


@@ -1727,20 +1956,20 @@ void wxVariant::Insert(const wxVariant& value)
     list.Insert(new 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();
 
 bool wxVariant::Member(const wxVariant& value) const
 {
     wxList& list = GetList();
 

-    wxNode* node = list.First();
+    wxList::compatibility_iterator node = list.GetFirst();

     while (node)
     {
     while (node)
     {

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

         if (value == *other)
         if (value == *other)

-            return TRUE;
-        node = node->Next();
+            return true;
+        node = node->GetNext();

     }
     }

-    return FALSE;
+    return false;

 }
 
 // Deletes the nth element of the list
 }
 
 // Deletes the nth element of the list


@@ -1748,12 +1977,12 @@ bool wxVariant::Delete(int item)
 {
     wxList& list = GetList();
 
 {
     wxList& list = GetList();
 

-    wxASSERT_MSG( (item < list.Number()), wxT("Invalid index to Delete") );
-    wxNode* node = list.Nth(item);
-    wxVariant* variant = (wxVariant*) node->Data();
+    wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") );
+    wxList::compatibility_iterator node = list.Item(item);
+    wxVariant* variant = (wxVariant*) node->GetData();

     delete variant;
     delete variant;

-    delete node;
-    return TRUE;
+    list.Erase(node);
+    return true;

 }
 
 // Clear list
 }
 
 // Clear list


@@ -1789,9 +2018,9 @@ bool wxVariant::Convert(long* value) const
     else if (type == wxT("string"))
         *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
     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
 }
 
 bool wxVariant::Convert(bool* value) const


@@ -1810,16 +2039,16 @@ bool wxVariant::Convert(bool* value) const
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();
         if (val == wxT("true") || val == wxT("yes"))
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();
         if (val == wxT("true") || val == wxT("yes"))

-            *value = TRUE;
+            *value = true;

         else if (val == wxT("false") || val == wxT("no"))
         else if (val == wxT("false") || val == wxT("no"))

-            *value = FALSE;
+            *value = false;

         else
         else

-            return FALSE;
+            return false;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxVariant::Convert(double* value) const
 }
 
 bool wxVariant::Convert(double* value) const


@@ -1836,9 +2065,9 @@ bool wxVariant::Convert(double* value) const
     else if (type == wxT("string"))
         *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
     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
 }
 
 bool wxVariant::Convert(char* value) const


@@ -1853,40 +2082,30 @@ bool wxVariant::Convert(char* value) const
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
 #endif
     else
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
 #endif
     else

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxVariant::Convert(wxString* value) const
 {
     *value = MakeString();
 }
 
 bool wxVariant::Convert(wxString* value) const
 {
     *value = MakeString();

-    return TRUE;
+    return true;

 }
 
 }
 

-#if wxUSE_TIMEDATE
-bool wxVariant::Convert(wxTime* value) const
+#if wxUSE_DATETIME
+bool wxVariant::Convert(wxDateTime* value) const

 {
     wxString type(GetType());
 {
     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;
+    if (type == wxT("datetime"))
+    {
+        *value = ((wxVariantDataDateTime*)GetData())->GetValue();
+        return true;
+    }
+    // Fallback to string conversion
+    wxString val;
+    return Convert(&val) &&
+                (value->ParseDateTime(val) || value->ParseDate(val));

 }
 }

+#endif // wxUSE_DATETIME

 
 

-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