Applied hash copy fix, BC++ makefile fix (though not the lib setup.h one we need...

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 90e577e68e2a484e9006b7f922bb1c10fc8d6135..6449a5fdd4aba61af4a32c36e52fcd1c0efc4451 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -6,36 +6,52 @@
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "variant.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "variant.h"

+#pragma implementation "time.h"
+#pragma implementation "date.h"

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#if wxUSE_IOSTREAMH
-#   include <fstream.h>
-#else
-#   include <fstream>
-#   ifdef _MSC_VER
-        using namespace std;
-#   endif
+#if wxUSE_STD_IOSTREAM
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif

 #endif
 
 #endif
 

+#if wxUSE_STREAMS

 #include "wx/stream.h"
 #include "wx/stream.h"

+#include "wx/txtstrm.h"
+#endif
+

 #include "wx/string.h"
 #include "wx/string.h"

+#include "wx/tokenzr.h"
+

 #include "wx/variant.h"
 
 #include "wx/variant.h"
 

+#if wxUSE_TIMEDATE
+IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
+
+wxTime::tFormat    wxTime::ms_Format    = wxTime::wx12h;
+wxTime::tPrecision wxTime::ms_Precision  = wxTime::wxStdMinSec;
+wxChar             wxTime::ms_bufTime[128];
+#endif
+

 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 

-wxVariant wxNullVariant;
+wxVariant WXDLLEXPORT wxNullVariant;

 
 /*
  * wxVariantDataList
 
 /*
  * wxVariantDataList


@@ -54,11 +70,15 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

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

     virtual bool Write(wxString& str) const;
     virtual bool Write(wxString& str) const;

-    virtual bool Read(istream& str);
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif

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

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

 
     void Clear();
 
 
     void Clear();
 


@@ -104,7 +124,7 @@ void wxVariantDataList::Clear()
 
 void wxVariantDataList::Copy(wxVariantData& data)
 {
 
 void wxVariantDataList::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "list"), "wxVariantDataList::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Copy: Can't copy to this type of data") );

 
     wxVariantDataList& listData = (wxVariantDataList&) data;
 
 
     wxVariantDataList& listData = (wxVariantDataList&) data;
 


@@ -120,7 +140,7 @@ void wxVariantDataList::Copy(wxVariantData& data)
 
 bool wxVariantDataList::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataList::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == "list"), "wxVariantDataList::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );

 
     wxVariantDataList& listData = (wxVariantDataList&) data;
     wxNode* node1 = m_value.First();
 
     wxVariantDataList& listData = (wxVariantDataList&) data;
     wxNode* node1 = m_value.First();


@@ -138,23 +158,25 @@ bool wxVariantDataList::Eq(wxVariantData& data) const
     return TRUE;
 }
 
     return TRUE;
 }
 

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

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

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

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 bool wxVariantDataList::Write(wxString& str) const
 {
 
 bool wxVariantDataList::Write(wxString& str) const
 {

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

     wxNode* node = m_value.First();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->Data();
         if (node != m_value.First())
     wxNode* node = m_value.First();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->Data();
         if (node != m_value.First())

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

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


@@ -163,16 +185,18 @@ bool wxVariantDataList::Write(wxString& str) const
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
 {

-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));

     // TODO
     return FALSE;
 }
     // TODO
     return FALSE;
 }

+#endif

 
 bool wxVariantDataList::Read(wxString& WXUNUSED(str))
 {
 
 bool wxVariantDataList::Read(wxString& WXUNUSED(str))
 {

-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));

     // TODO
     return FALSE;
 }
     // TODO
     return FALSE;
 }


@@ -193,11 +217,15 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

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

     virtual bool Write(wxString& str) const;
     virtual bool Write(wxString& str) const;

-    virtual bool Read(istream& str);
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif

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

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

 
 protected:
     wxStringList  m_value;
 
 protected:
     wxStringList  m_value;


@@ -212,7 +240,7 @@ void wxVariantDataStringList::SetValue(const wxStringList& value)
 
 void wxVariantDataStringList::Copy(wxVariantData& data)
 {
 
 void wxVariantDataStringList::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "stringlist"), "wxVariantDataStringList::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Copy: Can't copy to this type of data") );

 
     wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
 
 
     wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
 


@@ -221,15 +249,15 @@ void wxVariantDataStringList::Copy(wxVariantData& data)
 
 bool wxVariantDataStringList::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataStringList::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == "stringlist"), "wxVariantDataStringList::Eq: argument mismatch" );
+    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();
     while (node1 && node2)
     {
 
     wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
     wxNode* node1 = m_value.First();
     wxNode* node2 = listData.GetValue().First();
     while (node1 && node2)
     {

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

         if (str1 != str2)
             return FALSE;
         node1 = node1->Next();
         if (str1 != str2)
             return FALSE;
         node1 = node1->Next();


@@ -239,23 +267,25 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const
     return TRUE;
 }
 
     return TRUE;
 }
 

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

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

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

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 bool wxVariantDataStringList::Write(wxString& str) const
 {
 
 bool wxVariantDataStringList::Write(wxString& str) const
 {

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

     wxNode* node = m_value.First();
     while (node)
     {
     wxNode* node = m_value.First();
     while (node)
     {

-        char* s = (char*) node->Data();
+        wxChar* s = (wxChar*) node->Data();

         if (node != m_value.First())
         if (node != m_value.First())

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

         str += s;
         node = node->Next();
     }
         str += s;
         node = node->Next();
     }


@@ -263,16 +293,18 @@ bool wxVariantDataStringList::Write(wxString& str) const
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
 {

-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));

     // TODO
     return FALSE;
 }
     // TODO
     return FALSE;
 }

+#endif

 
 bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
 {
 
 bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
 {

-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));

     // TODO
     return FALSE;
 }
     // TODO
     return FALSE;
 }


@@ -293,13 +325,19 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

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

     virtual bool Write(wxString& str) const;
     virtual bool Write(wxString& str) const;

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

     virtual bool Read(wxInputStream& str);
     virtual bool Read(wxInputStream& str);

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

 
 protected:
     long m_value;
 
 protected:
     long m_value;


@@ -309,7 +347,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
 
 void wxVariantDataLong::Copy(wxVariantData& data)
 {
 
 void wxVariantDataLong::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "long"), "wxVariantDataLong::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Copy: Can't copy to this type of data") );

 
     wxVariantDataLong& otherData = (wxVariantDataLong&) data;
 
 
     wxVariantDataLong& otherData = (wxVariantDataLong&) data;
 


@@ -318,48 +356,57 @@ void wxVariantDataLong::Copy(wxVariantData& data)
 
 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == "long"), "wxVariantDataLong::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") );

 
     wxVariantDataLong& otherData = (wxVariantDataLong&) data;
 
     return (otherData.m_value == m_value);
 }
 
 
     wxVariantDataLong& otherData = (wxVariantDataLong&) data;
 
     return (otherData.m_value == m_value);
 }
 

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

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

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

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 

-bool wxVariantDataLong::Write(wxOutputStream& str) const
+bool wxVariantDataLong::Write(wxString& str) const

 {
 {

-    str << m_value;
+    str.Printf(wxT("%ld"), m_value);

     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxVariantDataLong::Write(wxString& str) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataLong::Read(wxSTD istream& str)

 {
 {

-    str.Printf("%ld", m_value);
+    str >> m_value;

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 

-bool wxVariantDataLong::Read(istream& str)
+#if wxUSE_STREAMS
+bool wxVariantDataLong::Write(wxOutputStream& str) const

 {
 {

-    str >> m_value;
+    wxTextOutputStream s(str);
+
+    s.Write32((size_t)m_value);

     return TRUE;
 }
 
 bool wxVariantDataLong::Read(wxInputStream& str)
 {
     return TRUE;
 }
 
 bool wxVariantDataLong::Read(wxInputStream& str)
 {

-   str >> m_value;
+   wxTextInputStream s(str);
+   m_value = s.Read32();

    return TRUE;
 }
    return TRUE;
 }

+#endif // wxUSE_STREAMS

 
 bool wxVariantDataLong::Read(wxString& str)
 {
 
 bool wxVariantDataLong::Read(wxString& str)
 {

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

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -379,13 +426,19 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

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

     virtual bool Write(wxString& str) const;
     virtual bool Write(wxString& str) const;

-    virtual bool Write(wxOutputStream &str) const;
-    virtual bool Read(istream& str);
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+#if wxUSE_STREAMS

     virtual bool Read(wxInputStream& str);
     virtual bool Read(wxInputStream& str);

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

 
 protected:
     double m_value;
 
 protected:
     double m_value;


@@ -395,7 +448,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData)
 
 void wxVariantDataReal::Copy(wxVariantData& data)
 {
 
 void wxVariantDataReal::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "double"), "wxVariantDataReal::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Copy: Can't copy to this type of data") );

 
     wxVariantDataReal& otherData = (wxVariantDataReal&) data;
 
 
     wxVariantDataReal& otherData = (wxVariantDataReal&) data;
 


@@ -404,51 +457,60 @@ void wxVariantDataReal::Copy(wxVariantData& data)
 
 bool wxVariantDataReal::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataReal::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == "double"), "wxVariantDataReal::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Eq: argument mismatch") );

 
     wxVariantDataReal& otherData = (wxVariantDataReal&) data;
 
     return (otherData.m_value == m_value);
 }
 
 
     wxVariantDataReal& otherData = (wxVariantDataReal&) data;
 
     return (otherData.m_value == m_value);
 }
 

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

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

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

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 

-bool wxVariantDataReal::Write(wxOutputStream& str) const
+bool wxVariantDataReal::Write(wxString& str) const

 {
 {

-    str << m_value;
+    str.Printf(wxT("%.4f"), m_value);

     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxVariantDataReal::Write(wxString& str) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataReal::Read(wxSTD istream& str)

 {
 {

-    str.Printf("%.4f", m_value);
+    str >> m_value;

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 

-bool wxVariantDataReal::Read(istream& str)
+#if wxUSE_STREAMS
+bool wxVariantDataReal::Write(wxOutputStream& str) const

 {
 {

-    str >> m_value;
+    wxTextOutputStream s(str);
+    s.WriteDouble((double)m_value);

     return TRUE;
 }
 
 bool wxVariantDataReal::Read(wxInputStream& str)
 {
     return TRUE;
 }
 
 bool wxVariantDataReal::Read(wxInputStream& str)
 {

-    str >> (float&)m_value;
+    wxTextInputStream s(str);
+    m_value = (float)s.ReadDouble();

     return TRUE;
 }
     return TRUE;
 }

+#endif // wxUSE_STREAMS

 
 bool wxVariantDataReal::Read(wxString& str)
 {
 
 bool wxVariantDataReal::Read(wxString& str)
 {

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

     return TRUE;
 }
 
     return TRUE;
 }
 

+#ifdef HAVE_BOOL

 /*
  * wxVariantDataBool
  */
 /*
  * wxVariantDataBool
  */


@@ -465,13 +527,19 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

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

     virtual bool Write(wxString& str) const;
     virtual bool Write(wxString& str) const;

-    virtual bool Read(istream& str);
-    virtual bool Read(wxInputStream& str);

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

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

 
 protected:
     bool m_value;
 
 protected:
     bool m_value;


@@ -481,7 +549,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
 
 void wxVariantDataBool::Copy(wxVariantData& data)
 {
 
 void wxVariantDataBool::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "bool"), "wxVariantDataBool::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Copy: Can't copy to this type of data") );

 
     wxVariantDataBool& otherData = (wxVariantDataBool&) data;
 
 
     wxVariantDataBool& otherData = (wxVariantDataBool&) data;
 


@@ -490,51 +558,62 @@ void wxVariantDataBool::Copy(wxVariantData& data)
 
 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == "bool"), "wxVariantDataBool::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") );

 
     wxVariantDataBool& otherData = (wxVariantDataBool&) data;
 
     return (otherData.m_value == m_value);
 }
 
 
     wxVariantDataBool& otherData = (wxVariantDataBool&) data;
 
     return (otherData.m_value == m_value);
 }
 

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

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

-    str << (const char*) s;
-    return TRUE;
-}
-
-bool wxVariantDataBool::Write(wxOutputStream& str) const
-{
-    str << (char)m_value;
+    str << (const char*) s.mb_str();

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 bool wxVariantDataBool::Write(wxString& str) const
 {
 
 bool wxVariantDataBool::Write(wxString& str) const
 {

-    str.Printf("%d", (int) m_value);
+    str.Printf(wxT("%d"), (int) m_value);

     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
 {

-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));

 //    str >> (long) m_value;
     return FALSE;
 }
 //    str >> (long) m_value;
     return FALSE;
 }

+#endif
+
+#if wxUSE_STREAMS
+bool wxVariantDataBool::Write(wxOutputStream& str) const
+{
+    wxTextOutputStream s(str);
+
+    s.Write8(m_value);
+    return TRUE;
+}

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

-    str >> (char&)m_value;
+    wxTextInputStream s(str);
+
+    m_value = s.Read8() != 0;

     return TRUE;
 }
     return TRUE;
 }

+#endif // wxUSE_STREAMS

 
 bool wxVariantDataBool::Read(wxString& str)
 {
 
 bool wxVariantDataBool::Read(wxString& str)
 {

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

     return TRUE;
 }
     return TRUE;
 }

+#endif // HAVE_BOOL

 
 /*
  * wxVariantDataChar
 
 /*
  * wxVariantDataChar


@@ -552,13 +631,17 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

-    virtual bool Write(ostream& str) const;
-    virtual bool Write(wxOutputStream& str) const;
+#if wxUSE_STD_IOSTREAM
+    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;
     virtual bool Write(wxString& str) const;

-    virtual bool Read(istream& str);
+#if wxUSE_STREAMS

     virtual bool Read(wxInputStream& str);
     virtual bool Read(wxInputStream& str);

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

 
 protected:
     char m_value;
 
 protected:
     char m_value;


@@ -568,7 +651,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
 
 void wxVariantDataChar::Copy(wxVariantData& data)
 {
 
 void wxVariantDataChar::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "char"), "wxVariantDataChar::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Copy: Can't copy to this type of data") );

 
     wxVariantDataChar& otherData = (wxVariantDataChar&) data;
 
 
     wxVariantDataChar& otherData = (wxVariantDataChar&) data;
 


@@ -577,45 +660,55 @@ void wxVariantDataChar::Copy(wxVariantData& data)
 
 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == "char"), "wxVariantDataChar::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") );

 
     wxVariantDataChar& otherData = (wxVariantDataChar&) data;
 
     return (otherData.m_value == m_value);
 }
 
 
     wxVariantDataChar& otherData = (wxVariantDataChar&) data;
 
     return (otherData.m_value == m_value);
 }
 

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

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

-    str << (const char*) s;
-    return TRUE;
-}
-
-bool wxVariantDataChar::Write(wxOutputStream& str) const
-{
-    str << m_value;
+    str << (const char*) s.mb_str();

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 bool wxVariantDataChar::Write(wxString& str) const
 {
 
 bool wxVariantDataChar::Write(wxString& str) const
 {

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

     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
 {

-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));

 //    str >> m_value;
     return FALSE;
 }
 //    str >> m_value;
     return FALSE;
 }

+#endif
+
+#if wxUSE_STREAMS
+bool wxVariantDataChar::Write(wxOutputStream& str) const
+{
+    wxTextOutputStream s(str);
+
+    s.Write8(m_value);
+    return TRUE;
+}

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

-    str >> m_value;
+    wxTextInputStream s(str);
+
+    m_value = s.Read8();

     return TRUE;
 }
     return TRUE;
 }

+#endif // wxUSE_STREAMS

 
 bool wxVariantDataChar::Read(wxString& str)
 {
 
 bool wxVariantDataChar::Read(wxString& str)
 {


@@ -627,9 +720,18 @@ bool wxVariantDataChar::Read(wxString& str)
  * wxVariantDataString
  */
 
  * wxVariantDataString
  */
 

+#if defined(__BORLANDC__) && defined(__WIN16__)
+// Change name because of truncation
+#define wxVariantDataString wxVariantStringData
+#endif
+

 class WXDLLEXPORT wxVariantDataString: public wxVariantData
 {
 class WXDLLEXPORT 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; }


@@ -639,13 +741,19 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

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

     virtual bool Write(wxString& str) const;
     virtual bool Write(wxString& str) const;

-    virtual bool Read(istream& str);
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+#if wxUSE_STREAMS

     virtual bool Read(wxInputStream& str);
     virtual bool Read(wxInputStream& str);

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

 
 protected:
     wxString m_value;
 
 protected:
     wxString m_value;


@@ -653,7 +761,7 @@ protected:
 
 void wxVariantDataString::Copy(wxVariantData& data)
 {
 
 void wxVariantDataString::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "string"), "wxVariantDataString::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Copy: Can't copy to this type of data") );

 
     wxVariantDataString& otherData = (wxVariantDataString&) data;
 
 
     wxVariantDataString& otherData = (wxVariantDataString&) data;
 


@@ -662,42 +770,52 @@ void wxVariantDataString::Copy(wxVariantData& data)
 
 bool wxVariantDataString::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataString::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == "string"), "wxVariantDataString::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") );

 
     wxVariantDataString& otherData = (wxVariantDataString&) data;
 
     return (otherData.m_value == m_value);
 }
 
 
     wxVariantDataString& otherData = (wxVariantDataString&) data;
 
     return (otherData.m_value == m_value);
 }
 

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

 {
 {

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

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 

-bool wxVariantDataString::Write(wxOutputStream& str) const
+bool wxVariantDataString::Write(wxString& str) const

 {
 {

-    str << (const char*) m_value;
+    str = m_value;

     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxVariantDataString::Write(wxString& str) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataString::Read(wxSTD istream& str)

 {
 {

-    str = m_value;
+    str >> m_value;

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 

-bool wxVariantDataString::Read(istream& str)
+#if wxUSE_STREAMS
+bool wxVariantDataString::Write(wxOutputStream& str) const

 {
 {

-    str >> m_value;
+  // why doesn't wxOutputStream::operator<< take "const wxString&"
+    wxTextOutputStream s(str);
+    s.WriteString(m_value);

     return TRUE;
 }
 
 bool wxVariantDataString::Read(wxInputStream& str)
 {
     return TRUE;
 }
 
 bool wxVariantDataString::Read(wxInputStream& str)
 {

-    str >> m_value;
+    wxTextInputStream s(str);
+
+    m_value = s.ReadString();

     return TRUE;
 }
     return TRUE;
 }

+#endif // wxUSE_STREAMS

 
 bool wxVariantDataString::Read(wxString& str)
 {
 
 bool wxVariantDataString::Read(wxString& str)
 {


@@ -705,13 +823,18 @@ bool wxVariantDataString::Read(wxString& 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
  */
 
 
 /*
  * wxVariantDataTime
  */
 

-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)

 
 class wxVariantDataTime: public wxVariantData
 {
 
 class wxVariantDataTime: public wxVariantData
 {


@@ -725,11 +848,15 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

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

     virtual bool Write(wxString& str) const;
     virtual bool Write(wxString& str) const;

-    virtual bool Read(istream& str);
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif

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

-    virtual wxString GetType() const { return "time"; };
+    virtual wxString GetType() const { return wxT("time"); };

        virtual wxVariantData* Clone() { return new wxVariantDataTime; }
 
 protected:
        virtual wxVariantData* Clone() { return new wxVariantDataTime; }
 
 protected:


@@ -740,7 +867,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData)
 
 void wxVariantDataTime::Copy(wxVariantData& data)
 {
 
 void wxVariantDataTime::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "time"), "wxVariantDataTime::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Copy: Can't copy to this type of data") );

 
     wxVariantDataTime& otherData = (wxVariantDataTime&) data;
 
 
     wxVariantDataTime& otherData = (wxVariantDataTime&) data;
 


@@ -749,35 +876,39 @@ void wxVariantDataTime::Copy(wxVariantData& data)
 
 bool wxVariantDataTime::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataTime::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == "time"), "wxVariantDataTime::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Eq: argument mismatch") );

 
     wxVariantDataTime& otherData = (wxVariantDataTime&) data;
 
     return (otherData.m_value == m_value);
 }
 
 
     wxVariantDataTime& otherData = (wxVariantDataTime&) data;
 
     return (otherData.m_value == m_value);
 }
 

-bool wxVariantDataTime::Write(ostream& str) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataTime::Write(wxSTD ostream& str) const

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

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

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 bool wxVariantDataTime::Write(wxString& str) const
 {
 
 bool wxVariantDataTime::Write(wxString& str) const
 {

-    char*s = m_value.FormatTime();
+    wxChar*s = m_value.FormatTime();

     str = s;
     return TRUE;
 }
 
     str = s;
     return TRUE;
 }
 

-bool wxVariantDataTime::Read(istream& str)
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataTime::Read(wxSTD istream& WXUNUSED(str))

 {
     // Not implemented
     return FALSE;
 }
 {
     // Not implemented
     return FALSE;
 }

+#endif

 
 

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

 {
     // Not implemented
     return FALSE;
 {
     // Not implemented
     return FALSE;


@@ -799,11 +930,15 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

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

     virtual bool Write(wxString& str) const;
     virtual bool Write(wxString& str) const;

-    virtual bool Read(istream& str);
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif

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

-    virtual wxString GetType() const { return "date"; };
+    virtual wxString GetType() const { return wxT("date"); };

        virtual wxVariantData* Clone() { return new wxVariantDataDate; }
 
 protected:
        virtual wxVariantData* Clone() { return new wxVariantDataDate; }
 
 protected:


@@ -814,7 +949,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData)
 
 void wxVariantDataDate::Copy(wxVariantData& data)
 {
 
 void wxVariantDataDate::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "date"), "wxVariantDataDate::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Copy: Can't copy to this type of data") );

 
     wxVariantDataDate& otherData = (wxVariantDataDate&) data;
 
 
     wxVariantDataDate& otherData = (wxVariantDataDate&) data;
 


@@ -823,20 +958,22 @@ void wxVariantDataDate::Copy(wxVariantData& data)
 
 bool wxVariantDataDate::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataDate::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == "date"), "wxVariantDataDate::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Eq: argument mismatch") );

 
     wxVariantDataDate& otherData = (wxVariantDataDate&) data;
 
     return (otherData.m_value == m_value);
 }
 
 
     wxVariantDataDate& otherData = (wxVariantDataDate&) data;
 
     return (otherData.m_value == m_value);
 }
 

-bool wxVariantDataDate::Write(ostream& str) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDate::Write(wxSTD ostream& str) const

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

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

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 bool wxVariantDataDate::Write(wxString& str) const
 {
 
 bool wxVariantDataDate::Write(wxString& str) const
 {


@@ -844,13 +981,15 @@ bool wxVariantDataDate::Write(wxString& str) const
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxVariantDataDate::Read(istream& str)
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDate::Read(wxSTD istream& WXUNUSED(str))

 {
     // Not implemented
     return FALSE;
 }
 {
     // Not implemented
     return FALSE;
 }

+#endif

 
 

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

 {
     // Not implemented
     return FALSE;
 {
     // Not implemented
     return FALSE;


@@ -874,11 +1013,15 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;

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

     virtual bool Write(wxString& str) const;
     virtual bool Write(wxString& str) const;

-    virtual bool Read(istream& str);
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif

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

-    virtual wxString GetType() const { return "void*"; };
+    virtual wxString GetType() const { return wxT("void*"); };

        virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
 
 protected:
        virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
 
 protected:


@@ -889,7 +1032,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
 
 void wxVariantDataVoidPtr::Copy(wxVariantData& data)
 {
 
 void wxVariantDataVoidPtr::Copy(wxVariantData& data)
 {

-    wxASSERT_MSG( (data.GetType() == "void*"), "wxVariantDataVoidPtr::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") );

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


@@ -898,40 +1041,237 @@ void wxVariantDataVoidPtr::Copy(wxVariantData& data)
 
 bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {

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

 
     wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 
     return (otherData.m_value == m_value);
 }
 
 
     wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 
     return (otherData.m_value == m_value);
 }
 

-bool wxVariantDataVoidPtr::Write(ostream& str) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const

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

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

     return TRUE;
 }
     return TRUE;
 }

+#endif

 
 bool wxVariantDataVoidPtr::Write(wxString& str) const
 {
 
 bool wxVariantDataVoidPtr::Write(wxString& str) const
 {

-    char buf[80];
-    sprintf(buf, "%ld", (long) m_value);
-    str = buf;
+    str.Printf(wxT("%ld"), (long) m_value);

     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxVariantDataVoidPtr::Read(istream& str)
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
+{
+    // Not implemented
+    return FALSE;
+}
+#endif
+
+bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
+{
+    // Not implemented
+    return FALSE;
+}
+
+/*
+ * wxVariantDataDateTime
+ */
+
+class wxVariantDataDateTime: public wxVariantData
+{
+    DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
+
+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, 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 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("datetime"); };
+    virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
+
+protected:
+    wxDateTime m_value;
+};
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
+
+void wxVariantDataDateTime::Copy(wxVariantData& data)
+{
+    wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Copy: Can't copy to this type of data") );
+
+    wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
+
+    otherData.m_value = m_value;
+}
+
+
+bool wxVariantDataDateTime::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") );
+
+    wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
+
+    return (otherData.m_value == m_value);
+}
+
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDateTime::Write(wxSTD ostream& str) const

 {
     // Not implemented
     return FALSE;
 }
 {
     // Not implemented
     return FALSE;
 }

+#endif
+
+
+bool wxVariantDataDateTime::Write(wxString& str) const
+{
+    str = m_value.Format();
+    return TRUE;
+}
+

 
 

-bool wxVariantDataVoidPtr::Read(wxString& str)
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))

 {
     // Not implemented
     return FALSE;
 }
 {
     // Not implemented
     return FALSE;
 }

+#endif
+
+
+bool wxVariantDataDateTime::Read(wxString& str)
+{
+    if(! m_value.ParseDateTime(str))
+        return FALSE;
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// 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
+bool wxVariantDataArrayString::Write(wxSTD ostream& str) const
+{
+    // Not implemented
+    return FALSE;
+}
+#endif
+
+
+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
+    return FALSE;
+}
+#endif
+
+
+bool wxVariantDataArrayString::Read(wxString& str)
+{
+    wxStringTokenizer tk(str, _T(";"));
+    while ( tk.HasMoreTokens() )
+    {
+        m_value.Add(tk.GetNextToken());
+    }
+
+    return TRUE;
+}
+

 
 
 /*
 
 
 /*


@@ -958,11 +1298,13 @@ wxVariant::wxVariant(long val, const wxString& name)
     m_name = name;
 }
 
     m_name = name;
 }
 

+#ifdef HAVE_BOOL

 wxVariant::wxVariant(bool val, const wxString& name)
 {
     m_data = new wxVariantDataBool(val);
     m_name = name;
 }
 wxVariant::wxVariant(bool val, const wxString& name)
 {
     m_data = new wxVariantDataBool(val);
     m_name = name;
 }

+#endif

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


@@ -976,7 +1318,7 @@ wxVariant::wxVariant(const wxString& val, const wxString& name)
     m_name = name;
 }
 
     m_name = name;
 }
 

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

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


@@ -994,7 +1336,8 @@ wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variant
     m_name = name;
 }
 
     m_name = name;
 }
 

-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)

 wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time
 {
     m_data = new wxVariantDataTime(val);
 wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time
 {
     m_data = new wxVariantDataTime(val);


@@ -1014,6 +1357,38 @@ wxVariant::wxVariant(void* val, const wxString& name) // Void ptr
     m_name = name;
 }
 
     m_name = name;
 }
 

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

 wxVariant::wxVariant(const wxVariant& variant)
 {
     if (!variant.IsNull())
 wxVariant::wxVariant(const wxVariant& variant)
 {
     if (!variant.IsNull())


@@ -1104,7 +1479,7 @@ bool wxVariant::operator!= (double value) const
 
 void wxVariant::operator= (double value)
 {
 
 void wxVariant::operator= (double value)
 {

-    if (GetType() == "double")
+    if (GetType() == wxT("double"))

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


@@ -1132,7 +1507,7 @@ bool wxVariant::operator!= (long value) const
 
 void wxVariant::operator= (long value)
 {
 
 void wxVariant::operator= (long value)
 {

-    if (GetType() == "long")
+    if (GetType() == wxT("long"))

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


@@ -1160,7 +1535,7 @@ bool wxVariant::operator!= (char value) const
 
 void wxVariant::operator= (char value)
 {
 
 void wxVariant::operator= (char value)
 {

-    if (GetType() == "char")
+    if (GetType() == wxT("char"))

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


@@ -1172,6 +1547,7 @@ void wxVariant::operator= (char value)
     }
 }
 
     }
 }
 

+#ifdef HAVE_BOOL

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


@@ -1188,7 +1564,7 @@ bool wxVariant::operator!= (bool value) const
 
 void wxVariant::operator= (bool value)
 {
 
 void wxVariant::operator= (bool value)
 {

-    if (GetType() == "bool")
+    if (GetType() == wxT("bool"))

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


@@ -1199,14 +1575,15 @@ void wxVariant::operator= (bool value)
         m_data = new wxVariantDataBool(value);
     }
 }
         m_data = new wxVariantDataBool(value);
     }
 }

+#endif // HAVE_BOOL

 
 bool wxVariant::operator== (const wxString& value) const
 {
     wxString thisValue;
     if (!Convert(&thisValue))
         return FALSE;
 
 bool wxVariant::operator== (const wxString& value) const
 {
     wxString thisValue;
     if (!Convert(&thisValue))
         return FALSE;

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

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


@@ -1216,7 +1593,7 @@ bool wxVariant::operator!= (const wxString& value) const
 
 void wxVariant::operator= (const wxString& value)
 {
 
 void wxVariant::operator= (const wxString& value)
 {

-    if (GetType() == "string")
+    if (GetType() == wxT("string"))

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


@@ -1228,9 +1605,9 @@ void wxVariant::operator= (const wxString& value)
     }
 }
 
     }
 }
 

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

 {
 {

-    if (GetType() == "string")
+    if (GetType() == wxT("string"))

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


@@ -1244,7 +1621,7 @@ void wxVariant::operator= (const char* value)
 
 bool wxVariant::operator== (const wxStringList& value) const
 {
 
 bool wxVariant::operator== (const wxStringList& value) const
 {

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

 
     wxVariantDataStringList other(value);
     return (m_data->Eq(other));
 
     wxVariantDataStringList other(value);
     return (m_data->Eq(other));


@@ -1257,7 +1634,7 @@ bool wxVariant::operator!= (const wxStringList& value) const
 
 void wxVariant::operator= (const wxStringList& value)
 {
 
 void wxVariant::operator= (const wxStringList& value)
 {

-    if (GetType() == "stringlist")
+    if (GetType() == wxT("stringlist"))

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


@@ -1271,7 +1648,7 @@ void wxVariant::operator= (const wxStringList& value)
 
 bool wxVariant::operator== (const wxList& value) const
 {
 
 bool wxVariant::operator== (const wxList& value) const
 {

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

 
     wxVariantDataList other(value);
     return (m_data->Eq(other));
 
     wxVariantDataList other(value);
     return (m_data->Eq(other));


@@ -1284,7 +1661,7 @@ bool wxVariant::operator!= (const wxList& value) const
 
 void wxVariant::operator= (const wxList& value)
 {
 
 void wxVariant::operator= (const wxList& value)
 {

-    if (GetType() == "list")
+    if (GetType() == wxT("list"))

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


@@ -1296,14 +1673,15 @@ void wxVariant::operator= (const wxList& value)
     }
 }
 
     }
 }
 

-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)

 bool wxVariant::operator== (const wxTime& value) const
 {
     wxTime thisValue;
     if (!Convert(&thisValue))
         return FALSE;
 bool wxVariant::operator== (const wxTime& value) const
 {
     wxTime thisValue;
     if (!Convert(&thisValue))
         return FALSE;

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

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


@@ -1313,7 +1691,7 @@ bool wxVariant::operator!= (const wxTime& value) const
 
 void wxVariant::operator= (const wxTime& value)
 {
 
 void wxVariant::operator= (const wxTime& value)
 {

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

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


@@ -1330,8 +1708,8 @@ bool wxVariant::operator== (const wxDate& value) const
     wxDate thisValue;
     if (!Convert(&thisValue))
         return FALSE;
     wxDate thisValue;
     if (!Convert(&thisValue))
         return FALSE;

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

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


@@ -1341,7 +1719,7 @@ bool wxVariant::operator!= (const wxDate& value) const
 
 void wxVariant::operator= (const wxDate& value)
 {
 
 void wxVariant::operator= (const wxDate& value)
 {

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

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


@@ -1361,12 +1739,12 @@ bool wxVariant::operator== (void* value) const
 
 bool wxVariant::operator!= (void* value) const
 {
 
 bool wxVariant::operator!= (void* value) const
 {

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

 }
 
 void wxVariant::operator= (void* value)
 {
 }
 
 void wxVariant::operator= (void* value)
 {

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

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


@@ -1378,23 +1756,111 @@ void wxVariant::operator= (void* value)
     }
 }
 
     }
 }
 

+bool wxVariant::operator== (const wxDateTime& value) const
+{
+    wxDateTime thisValue;
+    if (!Convert(&thisValue))
+        return FALSE;
+
+    return value.IsEqualTo(thisValue);
+}
+
+bool wxVariant::operator!= (const wxDateTime& value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (const wxDateTime& value)
+{
+    if (GetType() == wxT("datetime"))
+    {
+        ((wxVariantDataDateTime*)GetData())->SetValue(value);
+    }
+    else
+    {
+        if (m_data)
+            delete m_data;
+        m_data = new wxVariantDataDateTime(value);
+    }
+}
+
+#if wxUSE_ODBC
+void wxVariant::operator= (const DATE_STRUCT* value)
+{
+    if (m_data)
+        delete m_data;
+    m_data = new wxVariantDataDateTime(value);
+}
+
+
+void wxVariant::operator= (const TIME_STRUCT* value)
+{
+    if (m_data)
+        delete m_data;
+    m_data = new wxVariantDataDateTime(value);
+}
+
+
+void wxVariant::operator= (const TIMESTAMP_STRUCT* value)
+{
+    if (m_data)
+        delete m_data;
+    m_data = new wxVariantDataDateTime(value);
+}
+
+#endif // wxUSE_ODBC
+
+bool wxVariant::operator==(const wxArrayString& 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"))
+    {
+        ((wxVariantDataArrayString *)GetData())->SetValue(value);
+    }
+    else
+    {
+        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
 {

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

 
 

-    if (GetType() == "list")
+    if (GetType() == wxT("list"))

     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;

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

         return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
     }
         return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
     }

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

     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;

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

 
 

-        wxVariant variant( wxString( (char*) (data->GetValue().Nth(idx)->Data()) ));
+        wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) ));

         return variant;
     }
     return wxNullVariant;
         return variant;
     }
     return wxNullVariant;


@@ -1405,10 +1871,10 @@ wxVariant& wxVariant::operator[] (size_t idx)
     // We can't return a reference to a variant for a string list, since the string
     // is actually stored as a char*, not a variant.
 
     // We can't return a reference to a variant for a string list, since the string
     // is actually stored as a char*, not a variant.
 

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

 
     wxVariantDataList* data = (wxVariantDataList*) m_data;
 
     wxVariantDataList* data = (wxVariantDataList*) m_data;

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

 
     return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
 }
 
     return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
 }


@@ -1416,14 +1882,14 @@ wxVariant& wxVariant::operator[] (size_t idx)
 // Return the number of elements in a list
 int wxVariant::GetCount() const
 {
 // Return the number of elements in a list
 int wxVariant::GetCount() const
 {

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

 
 

-    if (GetType() == "list")
+    if (GetType() == wxT("list"))

     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         return data->GetValue().Number();
     }
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         return data->GetValue().Number();
     }

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

     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
         return data->GetValue().Number();
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
         return data->GetValue().Number();


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

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

 }
 
 // Accessors
 }
 
 // Accessors


@@ -1456,7 +1922,7 @@ void wxVariant::SetData(wxVariantData* data)
 wxString wxVariant::GetType() const
 {
     if (IsNull())
 wxString wxVariant::GetType() const
 {
     if (IsNull())

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

     else
         return m_data->GetType();
 }
     else
         return m_data->GetType();
 }


@@ -1476,7 +1942,7 @@ double wxVariant::GetReal() const
         return value;
     else
     {
         return value;
     else
     {

-        wxFAIL_MSG("Could not convert to a real number");
+        wxFAIL_MSG(wxT("Could not convert to a real number"));

         return 0.0;
     }
 }
         return 0.0;
     }
 }


@@ -1488,7 +1954,7 @@ long wxVariant::GetInteger() const
         return value;
     else
     {
         return value;
     else
     {

-        wxFAIL_MSG("Could not convert to an integer");
+        wxFAIL_MSG(wxT("Could not convert to an integer"));

         return 0;
     }
 }
         return 0;
     }
 }


@@ -1500,7 +1966,7 @@ char wxVariant::GetChar() const
         return value;
     else
     {
         return value;
     else
     {

-        wxFAIL_MSG("Could not convert to a char");
+        wxFAIL_MSG(wxT("Could not convert to a char"));

         return 0;
     }
 }
         return 0;
     }
 }


@@ -1512,7 +1978,7 @@ bool wxVariant::GetBool() const
         return value;
     else
     {
         return value;
     else
     {

-        wxFAIL_MSG("Could not convert to a bool");
+        wxFAIL_MSG(wxT("Could not convert to a bool"));

         return 0;
     }
 }
         return 0;
     }
 }


@@ -1520,58 +1986,67 @@ 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("Could not convert to a string");
-        return wxString("");
+        wxFAIL_MSG(wxT("Could not convert to a string"));

     }
     }

+
+    return value;

 }
 
 }
 

-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)

 wxTime wxVariant::GetTime() const
 {
     wxTime value;
 wxTime wxVariant::GetTime() const
 {
     wxTime value;

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

     {
     {

-        wxFAIL_MSG("Could not convert to a time");
-        return wxTime();
+        wxFAIL_MSG(wxT("Could not convert to a time"));

     }
     }

+
+    return value;

 }
 
 wxDate wxVariant::GetDate() const
 {
     wxDate value;
 }
 
 wxDate wxVariant::GetDate() const
 {
     wxDate value;

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

     {
     {

-        wxFAIL_MSG("Could not convert to a date");
-        return wxDate();
+        wxFAIL_MSG(wxT("Could not convert to a date"));

     }
     }

+
+    return value;

 }
 }

-#endif
+#endif // wxUSE_TIMEDATE

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

-    wxASSERT( (GetType() == "void*") );
+    wxASSERT( (GetType() == wxT("void*")) );

 
     return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 
 
     return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 

+wxDateTime wxVariant::GetDateTime() const
+{
+    wxDateTime value;
+    if (!Convert(& value))
+    {
+        wxFAIL_MSG(wxT("Could not convert to a datetime"));
+    }
+
+    return value;
+}
+

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

-    wxASSERT( (GetType() == "list") );
+    wxASSERT( (GetType() == wxT("list")) );

 
     return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
 }
 
 wxStringList& wxVariant::GetStringList() const
 {
 
     return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
 }
 
 wxStringList& wxVariant::GetStringList() const
 {

-    wxASSERT( (GetType() == "stringlist") );
+    wxASSERT( (GetType() == wxT("stringlist")) );

 
     return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
 }
 
     return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
 }


@@ -1613,7 +2088,7 @@ bool wxVariant::Delete(int item)
 {
     wxList& list = GetList();
 
 {
     wxList& list = GetList();
 

-    wxASSERT_MSG( (item < list.Number()), "Invalid index to Delete" );
+    wxASSERT_MSG( (item < list.Number()), wxT("Invalid index to Delete") );

     wxNode* node = list.Nth(item);
     wxVariant* variant = (wxVariant*) node->Data();
     delete variant;
     wxNode* node = list.Nth(item);
     wxVariant* variant = (wxVariant*) node->Data();
     delete variant;


@@ -1624,13 +2099,13 @@ bool wxVariant::Delete(int item)
 // Clear list
 void wxVariant::ClearList()
 {
 // Clear list
 void wxVariant::ClearList()
 {

-    if (!IsNull() && (GetType() == "list"))
+    if (!IsNull() && (GetType() == wxT("list")))

     {
         ((wxVariantDataList*) m_data)->Clear();
     }
     else
     {
     {
         ((wxVariantDataList*) m_data)->Clear();
     }
     else
     {

-        if (GetType() != "list")
+        if (GetType() != wxT("list"))

         {
             delete m_data;
             m_data = NULL;
         {
             delete m_data;
             m_data = NULL;


@@ -1643,14 +2118,16 @@ void wxVariant::ClearList()
 bool wxVariant::Convert(long* value) const
 {
     wxString type(GetType());
 bool wxVariant::Convert(long* value) const
 {
     wxString type(GetType());

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

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

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

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

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

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

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

     else
         return FALSE;
 
     else
         return FALSE;
 


@@ -1660,19 +2137,21 @@ bool wxVariant::Convert(long* value) const
 bool wxVariant::Convert(bool* value) const
 {
     wxString type(GetType());
 bool wxVariant::Convert(bool* value) const
 {
     wxString type(GetType());

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

         *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
         *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);

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

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

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

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

-    else if (type == "string")
+#endif
+    else if (type == wxT("string"))

     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();

-        if (val == "true" || val == "yes")
+        if (val == wxT("true") || val == wxT("yes"))

             *value = TRUE;
             *value = TRUE;

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

             *value = FALSE;
         else
             return FALSE;
             *value = FALSE;
         else
             return FALSE;


@@ -1686,14 +2165,16 @@ bool wxVariant::Convert(bool* value) const
 bool wxVariant::Convert(double* value) const
 {
     wxString type(GetType());
 bool wxVariant::Convert(double* value) const
 {
     wxString type(GetType());

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

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

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

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

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

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

-    else if (type == "string")
-        *value = (double) atof((const char*) ((wxVariantDataString*)GetData())->GetValue());
+#endif
+    else if (type == wxT("string"))
+        *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());

     else
         return FALSE;
 
     else
         return FALSE;
 


@@ -1703,12 +2184,14 @@ bool wxVariant::Convert(double* value) const
 bool wxVariant::Convert(char* value) const
 {
     wxString type(GetType());
 bool wxVariant::Convert(char* value) const
 {
     wxString type(GetType());

-    if (type == "char")
+    if (type == wxT("char"))

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

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

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

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

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

+#endif

     else
         return FALSE;
 
     else
         return FALSE;
 


@@ -1721,13 +2204,14 @@ bool wxVariant::Convert(wxString* value) const
     return TRUE;
 }
 
     return TRUE;
 }
 

-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)

 bool wxVariant::Convert(wxTime* value) const
 {
     wxString type(GetType());
 bool wxVariant::Convert(wxTime* value) const
 {
     wxString type(GetType());

-    if (type == "time")
+    if (type == wxT("time"))

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

-    else if (type == "date")
+    else if (type == wxT("date"))

         *value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
     else
         return FALSE;
         *value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
     else
         return FALSE;


@@ -1738,12 +2222,22 @@ bool wxVariant::Convert(wxTime* value) const
 bool wxVariant::Convert(wxDate* value) const
 {
     wxString type(GetType());
 bool wxVariant::Convert(wxDate* value) const
 {
     wxString type(GetType());

-    if (type == "date")
+    if (type == wxT("date"))

         *value = ((wxVariantDataDate*)GetData())->GetValue();
     else
         return FALSE;
 
     return TRUE;
 }
         *value = ((wxVariantDataDate*)GetData())->GetValue();
     else
         return FALSE;
 
     return TRUE;
 }

-#endif
- // wxUSE_TIMEDATE
+#endif // wxUSE_TIMEDATE
+
+bool wxVariant::Convert(wxDateTime* value) const
+{
+    wxString type(GetType());
+    if (type == wxT("datetime"))
+        *value = ((wxVariantDataDateTime*)GetData())->GetValue();
+    else
+        return FALSE;
+
+    return TRUE;
+}