removed compiler warnings about assignments in logical expressions

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index a8ab35073d36e317380553c42afecf6aa4a3173d..cab5e3ead12aa3b52b649d6b7bfa701e3674d9d6 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -38,11 +38,14 @@
 #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;
 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)
 


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

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

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

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

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


@@ -154,7 +157,7 @@ bool wxVariantDataList::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -181,7 +184,7 @@ bool wxVariantDataList::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


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

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

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

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

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


@@ -263,7 +266,7 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -289,7 +292,7 @@ bool wxVariantDataStringList::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


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

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

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


@@ -359,7 +362,7 @@ bool wxVariantDataLong::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -375,7 +378,7 @@ bool wxVariantDataLong::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


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

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

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

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

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


@@ -460,7 +463,7 @@ bool wxVariantDataReal::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -476,7 +479,7 @@ bool wxVariantDataReal::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


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

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

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

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

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


@@ -561,7 +564,7 @@ bool wxVariantDataBool::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -577,7 +580,7 @@ bool wxVariantDataBool::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


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

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

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


@@ -663,7 +666,7 @@ bool wxVariantDataChar::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -679,7 +682,7 @@ bool wxVariantDataChar::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


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

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

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

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

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


@@ -773,7 +776,7 @@ bool wxVariantDataString::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -787,7 +790,7 @@ bool wxVariantDataString::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -828,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
 {


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

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

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

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

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


@@ -878,7 +882,7 @@ bool wxVariantDataTime::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -895,7 +899,7 @@ bool wxVariantDataTime::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


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

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

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

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

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


@@ -960,7 +964,7 @@ bool wxVariantDataDate::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -976,7 +980,7 @@ bool wxVariantDataDate::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


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

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

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

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

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


@@ -1043,7 +1047,7 @@ bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -1059,7 +1063,7 @@ bool wxVariantDataVoidPtr::Write(wxString& str) const
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

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

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


@@ -1072,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


@@ -1135,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);


@@ -1155,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())


@@ -1348,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


@@ -1439,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


@@ -1473,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


@@ -1504,7 +1632,7 @@ 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)


@@ -1521,6 +1649,61 @@ 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
 {


@@ -1663,40 +1846,38 @@ bool wxVariant::GetBool() const
 wxString wxVariant::GetString() const
 {
     wxString value;
 wxString wxVariant::GetString() const
 {
     wxString value;

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

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

-        return wxString("");

     }
     }

+
+    return value;

 }
 
 }
 

-#if wxUSE_TIMEDATE
+// 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(wxT("Could not convert to a time"));
     {
         wxFAIL_MSG(wxT("Could not convert to a time"));

-        return wxTime();

     }
     }

+
+    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(wxT("Could not convert to a date"));
     {
         wxFAIL_MSG(wxT("Could not convert to a date"));

-        return wxDate();

     }
     }

+
+    return value;

 }
 }

-#endif
+#endif // wxUSE_TIMEDATE

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


@@ -1705,6 +1886,17 @@ void* wxVariant::GetVoidPtr() const
     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
 {
     wxASSERT( (GetType() == wxT("list")) );
 wxList& wxVariant::GetList() const
 {
     wxASSERT( (GetType() == wxT("list")) );


@@ -1872,7 +2064,8 @@ 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());


@@ -1896,5 +2089,15 @@ bool wxVariant::Convert(wxDate* value) const
 
     return TRUE;
 }
 
     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;
+}