added new text event macros description

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index bea0193b8e6b15b2069687e8f1c6a3b5f5835883..cab5e3ead12aa3b52b649d6b7bfa701e3674d9d6 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -11,6 +11,8 @@
 
 #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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -20,16 +22,31 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_IOSTREAMH
-#   include <fstream.h>
-#else
-#   include <fstream>
+#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/variant.h"
 
 #include "wx/string.h"
 #include "wx/variant.h"
 

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

 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
 wxVariant WXDLLEXPORT wxNullVariant;
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
 wxVariant WXDLLEXPORT wxNullVariant;


@@ -51,11 +68,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 _T("list"); };
+    virtual wxString GetType() const { return wxT("list"); };

 
     void Clear();
 
 
     void Clear();
 


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

-    wxASSERT_MSG( (data.GetType() == _T("list")), _T("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;
 


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

-    wxASSERT_MSG( (data.GetType() == _T("list")), _T("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();


@@ -135,23 +156,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);
     str << (const char*) s.mb_str();
     return TRUE;
 }
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     return TRUE;
 }

+#endif

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

-    str = _T("");
+    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 += _T(" ");
+          str += wxT(" ");

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


@@ -160,16 +183,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(_T("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(_T("Unimplemented"));
+    wxFAIL_MSG(wxT("Unimplemented"));

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


@@ -190,11 +215,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 _T("stringlist"); };
+    virtual wxString GetType() const { return wxT("stringlist"); };

 
 protected:
     wxStringList  m_value;
 
 protected:
     wxStringList  m_value;


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

-    wxASSERT_MSG( (data.GetType() == _T("stringlist")), _T("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;
 


@@ -218,7 +247,7 @@ void wxVariantDataStringList::Copy(wxVariantData& data)
 
 bool wxVariantDataStringList::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataStringList::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == _T("stringlist")), _T("wxVariantDataStringList::Eq: argument mismatch") );
+    wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );

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


@@ -236,23 +265,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);
     str << (const char*) s.mb_str();
     return TRUE;
 }
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     return TRUE;
 }

+#endif

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

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

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

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

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


@@ -260,16 +291,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(_T("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(_T("Unimplemented"));
+    wxFAIL_MSG(wxT("Unimplemented"));

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


@@ -293,15 +326,16 @@ public:
 
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;

-    virtual bool Read(istream& str);
-    virtual bool Write(ostream& str) const;
-
+#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 Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 

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

 
 protected:
     long m_value;
 
 protected:
     long m_value;


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

-    wxASSERT_MSG( (data.GetType() == _T("long")), _T("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;
 


@@ -320,43 +354,50 @@ void wxVariantDataLong::Copy(wxVariantData& data)
 
 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == _T("long")), _T("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);
     str << (const char*) s.mb_str();
     return TRUE;
 }
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     return TRUE;
 }

+#endif

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

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

     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
     str >> m_value;
     return TRUE;
 }
 {
     str >> m_value;
     return TRUE;
 }

+#endif

 
 #if wxUSE_STREAMS
 bool wxVariantDataLong::Write(wxOutputStream& str) const
 {
 
 #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;
 }
 #endif // wxUSE_STREAMS
    return TRUE;
 }
 #endif // wxUSE_STREAMS


@@ -384,14 +425,18 @@ public:
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
     virtual bool Read(wxString& str);
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
     virtual bool Read(wxString& str);

-    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

 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS

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

 
 protected:
     double m_value;
 
 protected:
     double m_value;


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

-    wxASSERT_MSG( (data.GetType() == _T("double")), _T("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;
 


@@ -410,43 +455,49 @@ void wxVariantDataReal::Copy(wxVariantData& data)
 
 bool wxVariantDataReal::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataReal::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == _T("double")), _T("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);
     str << (const char*) s.mb_str();
     return TRUE;
 }
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     return TRUE;
 }

+#endif

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

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

     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
     str >> m_value;
     return TRUE;
 }
 {
     str >> m_value;
     return TRUE;
 }

+#endif

 
 #if wxUSE_STREAMS
 bool wxVariantDataReal::Write(wxOutputStream& str) const
 {
 
 #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;
 }
 #endif // wxUSE_STREAMS
     return TRUE;
 }
 #endif // wxUSE_STREAMS


@@ -474,15 +525,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;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif

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

-    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 Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS

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

 
 protected:
     bool m_value;
 
 protected:
     bool m_value;


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

-    wxASSERT_MSG( (data.GetType() == _T("bool")), _T("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;
 


@@ -501,44 +556,52 @@ void wxVariantDataBool::Copy(wxVariantData& data)
 
 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == _T("bool")), _T("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);
     str << (const char*) s.mb_str();
     return TRUE;
 }
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     return TRUE;
 }

+#endif

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

-    str.Printf(_T("%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(_T("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
 {
 
 #if wxUSE_STREAMS
 bool wxVariantDataBool::Write(wxOutputStream& str) const
 {

-    str << (char)m_value;
+    wxTextOutputStream s(str);
+
+    s.Write8(m_value); 

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

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

     return TRUE;
 }
 #endif // wxUSE_STREAMS
     return TRUE;
 }
 #endif // wxUSE_STREAMS


@@ -566,15 +629,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 Read(istream& str);
-    virtual bool Write(ostream& 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;
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS

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

 
 protected:
     char m_value;
 
 protected:
     char m_value;


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

-    wxASSERT_MSG( (data.GetType() == _T("char")), _T("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;
 


@@ -593,44 +658,52 @@ void wxVariantDataChar::Copy(wxVariantData& data)
 
 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == _T("char")), _T("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);
     str << (const char*) s.mb_str();
     return TRUE;
 }
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     return TRUE;
 }

+#endif

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

-    str.Printf(_T("%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(_T("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
 {
 
 #if wxUSE_STREAMS
 bool wxVariantDataChar::Write(wxOutputStream& str) const
 {

-    str << m_value;
+    wxTextOutputStream s(str);
+
+    s.Write8(m_value);

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

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

     return TRUE;
 }
 #endif // wxUSE_STREAMS
     return TRUE;
 }
 #endif // wxUSE_STREAMS


@@ -666,15 +739,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;
+#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 Read(wxString& str);
     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 Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS

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

 
 protected:
     wxString m_value;
 
 protected:
     wxString m_value;


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

-    wxASSERT_MSG( (data.GetType() == _T("string")), _T("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;
 


@@ -691,18 +768,20 @@ void wxVariantDataString::Copy(wxVariantData& data)
 
 bool wxVariantDataString::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataString::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == _T("string")), _T("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.mb_str();
     return TRUE;
 }
 {
     str << (const char*) m_value.mb_str();
     return TRUE;
 }

+#endif

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


@@ -710,23 +789,28 @@ bool wxVariantDataString::Write(wxString& str) const
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
     str >> m_value;
     return TRUE;
 }
 {
     str >> m_value;
     return TRUE;
 }

+#endif

 
 #if wxUSE_STREAMS
 bool wxVariantDataString::Write(wxOutputStream& str) const
 {
   // why doesn't wxOutputStream::operator<< take "const wxString&"
 
 #if wxUSE_STREAMS
 bool wxVariantDataString::Write(wxOutputStream& str) const
 {
   // why doesn't wxOutputStream::operator<< take "const wxString&"

-    str << (const char*) m_value.mb_str();
+    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;
 }
 #endif // wxUSE_STREAMS
     return TRUE;
 }
 #endif // wxUSE_STREAMS


@@ -747,7 +831,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
  * 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
 {


@@ -761,11 +846,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 _T("time"); };
+    virtual wxString GetType() const { return wxT("time"); };

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


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

-    wxASSERT_MSG( (data.GetType() == _T("time")), _T("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;
 


@@ -785,20 +874,22 @@ void wxVariantDataTime::Copy(wxVariantData& data)
 
 bool wxVariantDataTime::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataTime::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == _T("time")), _T("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);
     str << (const char*) s.mb_str();
     return TRUE;
 }
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     return TRUE;
 }

+#endif

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


@@ -807,11 +898,13 @@ bool wxVariantDataTime::Write(wxString& str) const
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxVariantDataTime::Read(istream& WXUNUSED(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& WXUNUSED(str))
 {
 
 bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
 {


@@ -835,11 +928,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 _T("date"); };
+    virtual wxString GetType() const { return wxT("date"); };

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


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

-    wxASSERT_MSG( (data.GetType() == _T("date")), _T("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;
 


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

-    wxASSERT_MSG( (data.GetType() == _T("date")), _T("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);
     str << (const char*) s.mb_str();
     return TRUE;
 }
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     return TRUE;
 }

+#endif

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


@@ -880,11 +979,13 @@ bool wxVariantDataDate::Write(wxString& str) const
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxVariantDataDate::Read(istream& WXUNUSED(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& WXUNUSED(str))
 {
 
 bool wxVariantDataDate::Read(wxString& WXUNUSED(str))
 {


@@ -910,11 +1011,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 _T("void*"); };
+    virtual wxString GetType() const { return wxT("void*"); };

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


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

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


@@ -934,32 +1039,36 @@ void wxVariantDataVoidPtr::Copy(wxVariantData& data)
 
 bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == _T("void*")), _T("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);
     str << (const char*) s.mb_str();
     return TRUE;
 }
 {
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     return TRUE;
 }

+#endif

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

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

     return TRUE;
 }
 
     return TRUE;
 }
 

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

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

+#endif

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


@@ -967,6 +1076,102 @@ bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
     return FALSE;
 }
 
     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(ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(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(ostream& str) const
+{
+    // Not implemented
+    return FALSE;
+}
+#endif
+
+
+bool wxVariantDataDateTime::Write(wxString& str) const
+{
+    str = m_value.Format();
+    return TRUE;
+}
+
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDateTime::Read(istream& WXUNUSED(str))
+{
+    // Not implemented
+    return FALSE;
+}
+#endif
+
+
+bool wxVariantDataDateTime::Read(wxString& str)
+{
+    if(! m_value.ParseDateTime(str))
+        return FALSE;
+    return TRUE;
+}
+

 
 /*
  * wxVariant
 
 /*
  * wxVariant


@@ -1030,7 +1235,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);


@@ -1050,6 +1256,32 @@ 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
+

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


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

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

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


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

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

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


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

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

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


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

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

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


@@ -1243,8 +1475,8 @@ bool wxVariant::operator== (const wxString& value) const
     wxString thisValue;
     if (!Convert(&thisValue))
         return FALSE;
     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


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

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

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


@@ -1268,7 +1500,7 @@ void wxVariant::operator= (const wxString& value)
 
 void wxVariant::operator= (const wxChar* value)
 {
 
 void wxVariant::operator= (const wxChar* value)
 {

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

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


@@ -1282,7 +1514,7 @@ void wxVariant::operator= (const wxChar* value)
 
 bool wxVariant::operator== (const wxStringList& value) const
 {
 
 bool wxVariant::operator== (const wxStringList& value) const
 {

-    wxASSERT_MSG( (GetType() == _T("stringlist")), _T("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));


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

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

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


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

-    wxASSERT_MSG( (GetType() == _T("list")), _T("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));


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

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

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


@@ -1334,14 +1566,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


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

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

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


@@ -1368,8 +1601,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


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

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

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


@@ -1399,12 +1632,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() == _T("void*"))
+    if (GetType() == wxT("void*"))

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


@@ -1416,21 +1649,76 @@ 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
+

 // 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() == _T("list") || GetType() == _T("stringlist")), _T("Invalid type for array operator") );
+    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );

 
 

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

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

-        wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), _T("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() == _T("stringlist"))
+    else if (GetType() == wxT("stringlist"))

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

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

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


@@ -1443,10 +1731,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() == _T("list")), _T("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()), _T("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());
 }


@@ -1454,14 +1742,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() == _T("list") || GetType() == _T("stringlist")), _T("Invalid type for GetCount()") );
+    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") );

 
 

-    if (GetType() == _T("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() == _T("stringlist"))
+    else if (GetType() == wxT("stringlist"))

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


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

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

 }
 
 // Accessors
 }
 
 // Accessors


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

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

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


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

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

         return 0.0;
     }
 }
         return 0.0;
     }
 }


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

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

         return 0;
     }
 }
         return 0;
     }
 }


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

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

         return 0;
     }
 }
         return 0;
     }
 }


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

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

         return 0;
     }
 }
         return 0;
     }
 }


@@ -1558,58 +1846,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(_T("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(_T("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(_T("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() == _T("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() == _T("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() == _T("stringlist")) );
+    wxASSERT( (GetType() == wxT("stringlist")) );

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


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

-    wxASSERT_MSG( (item < list.Number()), _T("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;


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

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

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

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

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


@@ -1681,15 +1978,15 @@ void wxVariant::ClearList()
 bool wxVariant::Convert(long* value) const
 {
     wxString type(GetType());
 bool wxVariant::Convert(long* value) const
 {
     wxString type(GetType());

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

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

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

         *value = ((wxVariantDataLong*)GetData())->GetValue();
 #ifdef HAVE_BOOL
         *value = ((wxVariantDataLong*)GetData())->GetValue();
 #ifdef HAVE_BOOL

-    else if (type == _T("bool"))
+    else if (type == wxT("bool"))

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

-    else if (type == _T("string"))
+    else if (type == wxT("string"))

         *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
         return FALSE;
         *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
         return FALSE;


@@ -1700,21 +1997,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 == _T("double"))
+    if (type == wxT("double"))

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

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

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

-    else if (type == _T("bool"))
+    else if (type == wxT("bool"))

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

-    else if (type == _T("string"))
+    else if (type == wxT("string"))

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

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

             *value = TRUE;
             *value = TRUE;

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

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


@@ -1728,15 +2025,15 @@ 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 == _T("double"))
+    if (type == wxT("double"))

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

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

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

-    else if (type == _T("bool"))
+    else if (type == wxT("bool"))

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

-    else if (type == _T("string"))
+    else if (type == wxT("string"))

         *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
         return FALSE;
         *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
         return FALSE;


@@ -1747,12 +2044,12 @@ 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 == _T("char"))
+    if (type == wxT("char"))

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

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

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

-    else if (type == _T("bool"))
+    else if (type == wxT("bool"))

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


@@ -1767,13 +2064,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 == _T("time"))
+    if (type == wxT("time"))

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

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

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


@@ -1784,12 +2082,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 == _T("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;
+}