X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4a0c5be34be837210768501c13dbcff81e533c..4a45223c970eabf6ba66347129627775935c90b3:/src/common/variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index ad725d2e13..a0c5b4bdab 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -11,6 +11,8 @@
 
 #ifdef __GNUG__
 #pragma implementation "variant.h"
+#pragma implementation "time.h"
+#pragma implementation "date.h"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -20,16 +22,31 @@
     #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
 
+#if wxUSE_STREAMS
 #include "wx/stream.h"
+#include "wx/txtstrm.h"
+#endif
+
 #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;
@@ -51,11 +68,15 @@ public:
 
     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 "list"; };
+    virtual wxString GetType() const { return wxT("list"); };
 
     void Clear();
 
@@ -101,7 +122,7 @@ void wxVariantDataList::Clear()
 
 void wxVariantDataList::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "list"), "wxVariantDataList::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Copy: Can't copy to this type of data") );
 
     wxVariantDataList& listData = (wxVariantDataList&) data;
 
@@ -117,7 +138,7 @@ void wxVariantDataList::Copy(wxVariantData& data)
 
 bool wxVariantDataList::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "list"), "wxVariantDataList::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
 
     wxVariantDataList& listData = (wxVariantDataList&) data;
     wxNode* node1 = m_value.First();
@@ -135,23 +156,25 @@ bool wxVariantDataList::Eq(wxVariantData& data) const
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataList::Write(ostream& str) const
 {
     wxString s;
     Write(s);
-    str << (const char*) s;
+    str << (const char*) s.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataList::Write(wxString& str) const
 {
-    str = "";
+    str = wxT("");
     wxNode* node = m_value.First();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->Data();
         if (node != m_value.First())
-          str += " ";
+          str += wxT(" ");
         wxString str1;
         str += var->MakeString();
         node = node->Next();
@@ -160,16 +183,18 @@ bool wxVariantDataList::Write(wxString& str) const
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataList::Read(istream& WXUNUSED(str))
 {
-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
     return FALSE;
 }
+#endif
 
 bool wxVariantDataList::Read(wxString& WXUNUSED(str))
 {
-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
     return FALSE;
 }
@@ -190,11 +215,15 @@ public:
 
     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 "stringlist"; };
+    virtual wxString GetType() const { return wxT("stringlist"); };
 
 protected:
     wxStringList  m_value;
@@ -209,7 +238,7 @@ void wxVariantDataStringList::SetValue(const wxStringList& value)
 
 void wxVariantDataStringList::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "stringlist"), "wxVariantDataStringList::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Copy: Can't copy to this type of data") );
 
     wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
 
@@ -218,15 +247,15 @@ void wxVariantDataStringList::Copy(wxVariantData& data)
 
 bool wxVariantDataStringList::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "stringlist"), "wxVariantDataStringList::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
 
     wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
     wxNode* node1 = m_value.First();
     wxNode* node2 = listData.GetValue().First();
     while (node1 && node2)
     {
-        wxString str1 ((char*) node1->Data());
-        wxString str2 ((char*) node2->Data());
+        wxString str1 ((wxChar*) node1->Data());
+        wxString str2 ((wxChar*) node2->Data());
         if (str1 != str2)
             return FALSE;
         node1 = node1->Next();
@@ -236,23 +265,25 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataStringList::Write(ostream& str) const
 {
     wxString s;
     Write(s);
-    str << (const char*) s;
+    str << (const char*) s.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataStringList::Write(wxString& str) const
 {
-    str = "";
+    str = wxT("");
     wxNode* node = m_value.First();
     while (node)
     {
-        char* s = (char*) node->Data();
+        wxChar* s = (wxChar*) node->Data();
         if (node != m_value.First())
-          str += " ";
+          str += wxT(" ");
         str += s;
         node = node->Next();
     }
@@ -260,16 +291,18 @@ bool wxVariantDataStringList::Write(wxString& str) const
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataStringList::Read(istream& WXUNUSED(str))
 {
-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
     return FALSE;
 }
+#endif
 
 bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
 {
-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
     return FALSE;
 }
@@ -293,15 +326,16 @@ public:
 
     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;
-
+#endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
-    virtual wxString GetType() const { return "long"; };
+    virtual wxString GetType() const { return wxT("long"); };
 
 protected:
     long m_value;
@@ -311,7 +345,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
 
 void wxVariantDataLong::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "long"), "wxVariantDataLong::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Copy: Can't copy to this type of data") );
 
     wxVariantDataLong& otherData = (wxVariantDataLong&) data;
 
@@ -320,50 +354,57 @@ void wxVariantDataLong::Copy(wxVariantData& data)
 
 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "long"), "wxVariantDataLong::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") );
 
     wxVariantDataLong& otherData = (wxVariantDataLong&) data;
 
     return (otherData.m_value == m_value);
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataLong::Write(ostream& str) const
 {
     wxString s;
     Write(s);
-    str << (const char*) s;
+    str << (const char*) s.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataLong::Write(wxString& str) const
 {
-    str.Printf("%ld", m_value);
+    str.Printf(wxT("%ld"), m_value);
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataLong::Read(istream& str)
 {
     str >> m_value;
     return TRUE;
 }
+#endif
 
 #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)
 {
-   str >> m_value;
+   wxTextInputStream s(str);
+   m_value = s.Read32();
    return TRUE;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataLong::Read(wxString& str)
 {
-    m_value = atol((const char*) str);
+    m_value = wxAtol((const wxChar*) str);
     return TRUE;
 }
 
@@ -384,14 +425,18 @@ public:
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
     virtual bool Read(wxString& str);
+#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
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return "double"; };
+    virtual wxString GetType() const { return wxT("double"); };
 
 protected:
     double m_value;
@@ -401,7 +446,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData)
 
 void wxVariantDataReal::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "double"), "wxVariantDataReal::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Copy: Can't copy to this type of data") );
 
     wxVariantDataReal& otherData = (wxVariantDataReal&) data;
 
@@ -410,53 +455,60 @@ void wxVariantDataReal::Copy(wxVariantData& data)
 
 bool wxVariantDataReal::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "double"), "wxVariantDataReal::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Eq: argument mismatch") );
 
     wxVariantDataReal& otherData = (wxVariantDataReal&) data;
 
     return (otherData.m_value == m_value);
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataReal::Write(ostream& str) const
 {
     wxString s;
     Write(s);
-    str << (const char*) s;
+    str << (const char*) s.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataReal::Write(wxString& str) const
 {
-    str.Printf("%.4f", m_value);
+    str.Printf(wxT("%.4f"), m_value);
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataReal::Read(istream& str)
 {
     str >> m_value;
     return TRUE;
 }
+#endif
 
 #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)
 {
-    str >> (float&)m_value;
+    wxTextInputStream s(str);
+    m_value = (float)s.ReadDouble();
     return TRUE;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataReal::Read(wxString& str)
 {
-    m_value = atof((const char*) str);
+    m_value = wxAtof((const wxChar*) str);
     return TRUE;
 }
 
+#ifdef HAVE_BOOL
 /*
  * wxVariantDataBool
  */
@@ -473,15 +525,19 @@ public:
 
     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;
     virtual bool Read(wxString& str);
+#if wxUSE_STD_IOSTREAM
     virtual bool Read(istream& str);
+#endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return "bool"; };
+    virtual wxString GetType() const { return wxT("bool"); };
 
 protected:
     bool m_value;
@@ -491,7 +547,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
 
 void wxVariantDataBool::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "bool"), "wxVariantDataBool::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Copy: Can't copy to this type of data") );
 
     wxVariantDataBool& otherData = (wxVariantDataBool&) data;
 
@@ -500,53 +556,62 @@ void wxVariantDataBool::Copy(wxVariantData& data)
 
 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "bool"), "wxVariantDataBool::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") );
 
     wxVariantDataBool& otherData = (wxVariantDataBool&) data;
 
     return (otherData.m_value == m_value);
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataBool::Write(ostream& str) const
 {
     wxString s;
     Write(s);
-    str << (const char*) s;
+    str << (const char*) s.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataBool::Write(wxString& str) const
 {
-    str.Printf("%d", (int) m_value);
+    str.Printf(wxT("%d"), (int) m_value);
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataBool::Read(istream& WXUNUSED(str))
 {
-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> (long) m_value;
     return FALSE;
 }
+#endif
 
 #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)
 {
-    str >> (char&)m_value;
+    wxTextInputStream s(str);
+
+    m_value = s.Read8() != 0;
     return TRUE;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataBool::Read(wxString& str)
 {
-    m_value = (atol((const char*) str) != 0);
+    m_value = (wxAtol((const wxChar*) str) != 0);
     return TRUE;
 }
+#endif // HAVE_BOOL
 
 /*
  * wxVariantDataChar
@@ -564,15 +629,17 @@ public:
 
     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;
+#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 wxString GetType() const { return "char"; };
+    virtual wxString GetType() const { return wxT("char"); };
 
 protected:
     char m_value;
@@ -582,7 +649,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
 
 void wxVariantDataChar::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "char"), "wxVariantDataChar::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Copy: Can't copy to this type of data") );
 
     wxVariantDataChar& otherData = (wxVariantDataChar&) data;
 
@@ -591,44 +658,52 @@ void wxVariantDataChar::Copy(wxVariantData& data)
 
 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "char"), "wxVariantDataChar::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") );
 
     wxVariantDataChar& otherData = (wxVariantDataChar&) data;
 
     return (otherData.m_value == m_value);
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataChar::Write(ostream& str) const
 {
     wxString s;
     Write(s);
-    str << (const char*) s;
+    str << (const char*) s.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataChar::Write(wxString& str) const
 {
-    str.Printf("%c", m_value);
+    str.Printf(wxT("%c"), m_value);
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataChar::Read(istream& WXUNUSED(str))
 {
-    wxFAIL_MSG("Unimplemented");
+    wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> m_value;
     return FALSE;
 }
+#endif
 
 #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)
 {
-    str >> m_value;
+    wxTextInputStream s(str);
+
+    m_value = s.Read8();
     return TRUE;
 }
 #endif // wxUSE_STREAMS
@@ -664,15 +739,19 @@ public:
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
     virtual bool Write(ostream& str) const;
+#endif
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
     virtual bool Read(istream& str);
+#endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return "string"; };
+    virtual wxString GetType() const { return wxT("string"); };
 
 protected:
     wxString m_value;
@@ -680,7 +759,7 @@ protected:
 
 void wxVariantDataString::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "string"), "wxVariantDataString::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Copy: Can't copy to this type of data") );
 
     wxVariantDataString& otherData = (wxVariantDataString&) data;
 
@@ -689,18 +768,20 @@ void wxVariantDataString::Copy(wxVariantData& data)
 
 bool wxVariantDataString::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "string"), "wxVariantDataString::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") );
 
     wxVariantDataString& otherData = (wxVariantDataString&) data;
 
     return (otherData.m_value == m_value);
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataString::Write(ostream& str) const
 {
-    str << (const char*) m_value;
+    str << (const char*) m_value.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataString::Write(wxString& str) const
 {
@@ -708,22 +789,28 @@ bool wxVariantDataString::Write(wxString& str) const
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataString::Read(istream& str)
 {
     str >> m_value;
     return TRUE;
 }
+#endif
 
 #if wxUSE_STREAMS
 bool wxVariantDataString::Write(wxOutputStream& str) const
 {
-    str << (const char*) m_value;
+  // why doesn't wxOutputStream::operator<< take "const wxString&"
+    wxTextOutputStream s(str);
+    s.WriteString(m_value);
     return TRUE;
 }
 
 bool wxVariantDataString::Read(wxInputStream& str)
 {
-    str >> m_value;
+    wxTextInputStream s(str);
+
+    m_value = s.ReadString();
     return TRUE;
 }
 #endif // wxUSE_STREAMS
@@ -744,7 +831,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
  * 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
 {
@@ -758,11 +846,15 @@ public:
 
     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 "time"; };
+    virtual wxString GetType() const { return wxT("time"); };
 	virtual wxVariantData* Clone() { return new wxVariantDataTime; }
 
 protected:
@@ -773,7 +865,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData)
 
 void wxVariantDataTime::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "time"), "wxVariantDataTime::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Copy: Can't copy to this type of data") );
 
     wxVariantDataTime& otherData = (wxVariantDataTime&) data;
 
@@ -782,33 +874,37 @@ void wxVariantDataTime::Copy(wxVariantData& data)
 
 bool wxVariantDataTime::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "time"), "wxVariantDataTime::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Eq: argument mismatch") );
 
     wxVariantDataTime& otherData = (wxVariantDataTime&) data;
 
     return (otherData.m_value == m_value);
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataTime::Write(ostream& str) const
 {
     wxString s;
     Write(s);
-    str << (const char*) s;
+    str << (const char*) s.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataTime::Write(wxString& str) const
 {
-    char*s = m_value.FormatTime();
+    wxChar*s = m_value.FormatTime();
     str = s;
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataTime::Read(istream& WXUNUSED(str))
 {
     // Not implemented
     return FALSE;
 }
+#endif
 
 bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
 {
@@ -832,11 +928,15 @@ public:
 
     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 "date"; };
+    virtual wxString GetType() const { return wxT("date"); };
 	virtual wxVariantData* Clone() { return new wxVariantDataDate; }
 
 protected:
@@ -847,7 +947,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData)
 
 void wxVariantDataDate::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "date"), "wxVariantDataDate::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Copy: Can't copy to this type of data") );
 
     wxVariantDataDate& otherData = (wxVariantDataDate&) data;
 
@@ -856,20 +956,22 @@ void wxVariantDataDate::Copy(wxVariantData& data)
 
 bool wxVariantDataDate::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "date"), "wxVariantDataDate::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Eq: argument mismatch") );
 
     wxVariantDataDate& otherData = (wxVariantDataDate&) data;
 
     return (otherData.m_value == m_value);
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataDate::Write(ostream& str) const
 {
     wxString s;
     Write(s);
-    str << (const char*) s;
+    str << (const char*) s.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataDate::Write(wxString& str) const
 {
@@ -877,11 +979,13 @@ bool wxVariantDataDate::Write(wxString& str) const
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataDate::Read(istream& WXUNUSED(str))
 {
     // Not implemented
     return FALSE;
 }
+#endif
 
 bool wxVariantDataDate::Read(wxString& WXUNUSED(str))
 {
@@ -907,11 +1011,15 @@ public:
 
     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 "void*"; };
+    virtual wxString GetType() const { return wxT("void*"); };
 	virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
 
 protected:
@@ -922,7 +1030,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
 
 void wxVariantDataVoidPtr::Copy(wxVariantData& data)
 {
-    wxASSERT_MSG( (data.GetType() == "void*"), "wxVariantDataVoidPtr::Copy: Can't copy to this type of data" );
+    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
 
     wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 
@@ -931,34 +1039,36 @@ void wxVariantDataVoidPtr::Copy(wxVariantData& data)
 
 bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {
-    wxASSERT_MSG( (data.GetType() == "void*"), "wxVariantDataVoidPtr::Eq: argument mismatch" );
+    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
 
     wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 
     return (otherData.m_value == m_value);
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataVoidPtr::Write(ostream& str) const
 {
     wxString s;
     Write(s);
-    str << (const char*) s;
+    str << (const char*) s.mb_str();
     return TRUE;
 }
+#endif
 
 bool wxVariantDataVoidPtr::Write(wxString& str) const
 {
-    char buf[80];
-    sprintf(buf, "%ld", (long) m_value);
-    str = buf;
+    str.Printf(wxT("%ld"), (long) m_value);
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 bool wxVariantDataVoidPtr::Read(istream& WXUNUSED(str))
 {
     // Not implemented
     return FALSE;
 }
+#endif
 
 bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
 {
@@ -991,11 +1101,13 @@ wxVariant::wxVariant(long val, const wxString& name)
     m_name = name;
 }
 
+#ifdef HAVE_BOOL
 wxVariant::wxVariant(bool val, const wxString& name)
 {
     m_data = new wxVariantDataBool(val);
     m_name = name;
 }
+#endif
 
 wxVariant::wxVariant(char val, const wxString& name)
 {
@@ -1009,7 +1121,7 @@ wxVariant::wxVariant(const wxString& val, const wxString& name)
     m_name = name;
 }
 
-wxVariant::wxVariant(const char* val, const wxString& name)
+wxVariant::wxVariant(const wxChar* val, const wxString& name)
 {
     m_data = new wxVariantDataString(wxString(val));
     m_name = name;
@@ -1027,7 +1139,8 @@ wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variant
     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);
@@ -1137,7 +1250,7 @@ bool wxVariant::operator!= (double value) const
 
 void wxVariant::operator= (double value)
 {
-    if (GetType() == "double")
+    if (GetType() == wxT("double"))
     {
         ((wxVariantDataReal*)GetData())->SetValue(value);
     }
@@ -1165,7 +1278,7 @@ bool wxVariant::operator!= (long value) const
 
 void wxVariant::operator= (long value)
 {
-    if (GetType() == "long")
+    if (GetType() == wxT("long"))
     {
         ((wxVariantDataLong*)GetData())->SetValue(value);
     }
@@ -1193,7 +1306,7 @@ bool wxVariant::operator!= (char value) const
 
 void wxVariant::operator= (char value)
 {
-    if (GetType() == "char")
+    if (GetType() == wxT("char"))
     {
         ((wxVariantDataChar*)GetData())->SetValue(value);
     }
@@ -1205,6 +1318,7 @@ void wxVariant::operator= (char value)
     }
 }
 
+#ifdef HAVE_BOOL
 bool wxVariant::operator== (bool value) const
 {
     bool thisValue;
@@ -1221,7 +1335,7 @@ bool wxVariant::operator!= (bool value) const
 
 void wxVariant::operator= (bool value)
 {
-    if (GetType() == "bool")
+    if (GetType() == wxT("bool"))
     {
         ((wxVariantDataBool*)GetData())->SetValue(value);
     }
@@ -1232,14 +1346,15 @@ void wxVariant::operator= (bool value)
         m_data = new wxVariantDataBool(value);
     }
 }
+#endif // HAVE_BOOL
 
 bool wxVariant::operator== (const wxString& value) const
 {
     wxString thisValue;
     if (!Convert(&thisValue))
         return FALSE;
-    else
-        return (value == thisValue);
+
+    return value == thisValue;
 }
 
 bool wxVariant::operator!= (const wxString& value) const
@@ -1249,7 +1364,7 @@ bool wxVariant::operator!= (const wxString& value) const
 
 void wxVariant::operator= (const wxString& value)
 {
-    if (GetType() == "string")
+    if (GetType() == wxT("string"))
     {
         ((wxVariantDataString*)GetData())->SetValue(value);
     }
@@ -1261,9 +1376,9 @@ void wxVariant::operator= (const wxString& value)
     }
 }
 
-void wxVariant::operator= (const char* value)
+void wxVariant::operator= (const wxChar* value)
 {
-    if (GetType() == "string")
+    if (GetType() == wxT("string"))
     {
         ((wxVariantDataString*)GetData())->SetValue(wxString(value));
     }
@@ -1277,7 +1392,7 @@ void wxVariant::operator= (const char* value)
 
 bool wxVariant::operator== (const wxStringList& value) const
 {
-    wxASSERT_MSG( (GetType() == "stringlist"), "Invalid type for == operator" );
+    wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
 
     wxVariantDataStringList other(value);
     return (m_data->Eq(other));
@@ -1290,7 +1405,7 @@ bool wxVariant::operator!= (const wxStringList& value) const
 
 void wxVariant::operator= (const wxStringList& value)
 {
-    if (GetType() == "stringlist")
+    if (GetType() == wxT("stringlist"))
     {
         ((wxVariantDataStringList*)GetData())->SetValue(value);
     }
@@ -1304,7 +1419,7 @@ void wxVariant::operator= (const wxStringList& value)
 
 bool wxVariant::operator== (const wxList& value) const
 {
-    wxASSERT_MSG( (GetType() == "list"), "Invalid type for == operator" );
+    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
 
     wxVariantDataList other(value);
     return (m_data->Eq(other));
@@ -1317,7 +1432,7 @@ bool wxVariant::operator!= (const wxList& value) const
 
 void wxVariant::operator= (const wxList& value)
 {
-    if (GetType() == "list")
+    if (GetType() == wxT("list"))
     {
         ((wxVariantDataList*)GetData())->SetValue(value);
     }
@@ -1329,14 +1444,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;
-    else
-        return (value == thisValue);
+
+    return value == thisValue;
 }
 
 bool wxVariant::operator!= (const wxTime& value) const
@@ -1346,7 +1462,7 @@ bool wxVariant::operator!= (const wxTime& value) const
 
 void wxVariant::operator= (const wxTime& value)
 {
-    if (GetType() == "time")
+    if (GetType() == wxT("time"))
     {
         ((wxVariantDataTime*)GetData())->SetValue(value);
     }
@@ -1363,8 +1479,8 @@ bool wxVariant::operator== (const wxDate& value) const
     wxDate thisValue;
     if (!Convert(&thisValue))
         return FALSE;
-    else
-        return (value == thisValue);
+
+    return (value == thisValue);
 }
 
 bool wxVariant::operator!= (const wxDate& value) const
@@ -1374,7 +1490,7 @@ bool wxVariant::operator!= (const wxDate& value) const
 
 void wxVariant::operator= (const wxDate& value)
 {
-    if (GetType() == "date")
+    if (GetType() == wxT("date"))
     {
         ((wxVariantDataTime*)GetData())->SetValue(value);
     }
@@ -1394,12 +1510,12 @@ bool wxVariant::operator== (void* value) const
 
 bool wxVariant::operator!= (void* value) const
 {
-    return (!((*this) == value));
+    return (!((*this) == (void*) value));
 }
 
 void wxVariant::operator= (void* value)
 {
-    if (GetType() == "void*")
+    if (GetType() == wxT("void*"))
     {
         ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
     }
@@ -1414,20 +1530,20 @@ void wxVariant::operator= (void* value)
 // Treat a list variant as an array
 wxVariant wxVariant::operator[] (size_t idx) const
 {
-    wxASSERT_MSG( (GetType() == "list" || GetType() == "stringlist"), "Invalid type for array operator" );
+    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );
 
-    if (GetType() == "list")
+    if (GetType() == wxT("list"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
-        wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), "Invalid index for array" );
+        wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
         return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
     }
-    else if (GetType() == "stringlist")
+    else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
-        wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), "Invalid index for array" );
+        wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
 
-        wxVariant variant( wxString( (char*) (data->GetValue().Nth(idx)->Data()) ));
+        wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) ));
         return variant;
     }
     return wxNullVariant;
@@ -1438,10 +1554,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.
 
-    wxASSERT_MSG( (GetType() == "list"), "Invalid type for array operator" );
+    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
 
     wxVariantDataList* data = (wxVariantDataList*) m_data;
-    wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), "Invalid index for array" );
+    wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
 
     return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
 }
@@ -1449,14 +1565,14 @@ wxVariant& wxVariant::operator[] (size_t idx)
 // Return the number of elements in a list
 int wxVariant::GetCount() const
 {
-    wxASSERT_MSG( (GetType() == "list" || GetType() == "stringlist"), "Invalid type for GetCount()" );
+    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") );
 
-    if (GetType() == "list")
+    if (GetType() == wxT("list"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         return data->GetValue().Number();
     }
-    else if (GetType() == "stringlist")
+    else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
         return data->GetValue().Number();
@@ -1472,7 +1588,7 @@ wxString wxVariant::MakeString() const
         if (GetData()->Write(str))
             return str;
     }
-    return wxString("");
+    return wxString(wxT(""));
 }
 
 // Accessors
@@ -1489,7 +1605,7 @@ void wxVariant::SetData(wxVariantData* data)
 wxString wxVariant::GetType() const
 {
     if (IsNull())
-        return wxString("null");
+        return wxString(wxT("null"));
     else
         return m_data->GetType();
 }
@@ -1509,7 +1625,7 @@ double wxVariant::GetReal() const
         return value;
     else
     {
-        wxFAIL_MSG("Could not convert to a real number");
+        wxFAIL_MSG(wxT("Could not convert to a real number"));
         return 0.0;
     }
 }
@@ -1521,7 +1637,7 @@ long wxVariant::GetInteger() const
         return value;
     else
     {
-        wxFAIL_MSG("Could not convert to an integer");
+        wxFAIL_MSG(wxT("Could not convert to an integer"));
         return 0;
     }
 }
@@ -1533,7 +1649,7 @@ char wxVariant::GetChar() const
         return value;
     else
     {
-        wxFAIL_MSG("Could not convert to a char");
+        wxFAIL_MSG(wxT("Could not convert to a char"));
         return 0;
     }
 }
@@ -1545,7 +1661,7 @@ bool wxVariant::GetBool() const
         return value;
     else
     {
-        wxFAIL_MSG("Could not convert to a bool");
+        wxFAIL_MSG(wxT("Could not convert to a bool"));
         return 0;
     }
 }
@@ -1553,58 +1669,56 @@ bool wxVariant::GetBool() const
 wxString wxVariant::GetString() const
 {
     wxString value;
-    if (Convert(& value))
-        return value;
-    else
+    if (!Convert(& value))
     {
-        wxFAIL_MSG("Could not convert to a string");
-        return wxString("");
+        wxFAIL_MSG(wxT("Could not convert to a string"));
     }
+
+    return value;
 }
 
-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
 wxTime wxVariant::GetTime() const
 {
     wxTime value;
-    if (Convert(& value))
-        return value;
-    else
+    if (!Convert(& value))
     {
-        wxFAIL_MSG("Could not convert to a time");
-        return wxTime();
+        wxFAIL_MSG(wxT("Could not convert to a time"));
     }
+
+    return value;
 }
 
 wxDate wxVariant::GetDate() const
 {
     wxDate value;
-    if (Convert(& value))
-        return value;
-    else
+    if (!Convert(& value))
     {
-        wxFAIL_MSG("Could not convert to a date");
-        return wxDate();
+        wxFAIL_MSG(wxT("Could not convert to a date"));
     }
+
+    return value;
 }
-#endif
+#endif // wxUSE_TIMEDATE
 
 void* wxVariant::GetVoidPtr() const
 {
-    wxASSERT( (GetType() == "void*") );
+    wxASSERT( (GetType() == wxT("void*")) );
 
     return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 
 wxList& wxVariant::GetList() const
 {
-    wxASSERT( (GetType() == "list") );
+    wxASSERT( (GetType() == wxT("list")) );
 
     return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
 }
 
 wxStringList& wxVariant::GetStringList() const
 {
-    wxASSERT( (GetType() == "stringlist") );
+    wxASSERT( (GetType() == wxT("stringlist")) );
 
     return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
 }
@@ -1646,7 +1760,7 @@ bool wxVariant::Delete(int item)
 {
     wxList& list = GetList();
 
-    wxASSERT_MSG( (item < list.Number()), "Invalid index to Delete" );
+    wxASSERT_MSG( (item < list.Number()), wxT("Invalid index to Delete") );
     wxNode* node = list.Nth(item);
     wxVariant* variant = (wxVariant*) node->Data();
     delete variant;
@@ -1657,13 +1771,13 @@ bool wxVariant::Delete(int item)
 // Clear list
 void wxVariant::ClearList()
 {
-    if (!IsNull() && (GetType() == "list"))
+    if (!IsNull() && (GetType() == wxT("list")))
     {
         ((wxVariantDataList*) m_data)->Clear();
     }
     else
     {
-        if (GetType() != "list")
+        if (GetType() != wxT("list"))
         {
             delete m_data;
             m_data = NULL;
@@ -1676,14 +1790,16 @@ void wxVariant::ClearList()
 bool wxVariant::Convert(long* value) const
 {
     wxString type(GetType());
-    if (type == "double")
+    if (type == wxT("double"))
         *value = (long) (((wxVariantDataReal*)GetData())->GetValue());
-    else if (type == "long")
+    else if (type == wxT("long"))
         *value = ((wxVariantDataLong*)GetData())->GetValue();
-    else if (type == "bool")
+#ifdef HAVE_BOOL
+    else if (type == wxT("bool"))
         *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
-    else if (type == "string")
-        *value = atol((const char*) ((wxVariantDataString*)GetData())->GetValue());
+#endif
+    else if (type == wxT("string"))
+        *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
         return FALSE;
 
@@ -1693,19 +1809,21 @@ bool wxVariant::Convert(long* value) const
 bool wxVariant::Convert(bool* value) const
 {
     wxString type(GetType());
-    if (type == "double")
+    if (type == wxT("double"))
         *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
-    else if (type == "long")
+    else if (type == wxT("long"))
         *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
-    else if (type == "bool")
+#ifdef HAVE_BOOL
+    else if (type == wxT("bool"))
         *value = ((wxVariantDataBool*)GetData())->GetValue();
-    else if (type == "string")
+#endif
+    else if (type == wxT("string"))
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();
-        if (val == "true" || val == "yes")
+        if (val == wxT("true") || val == wxT("yes"))
             *value = TRUE;
-        else if (val == "false" || val == "no")
+        else if (val == wxT("false") || val == wxT("no"))
             *value = FALSE;
         else
             return FALSE;
@@ -1719,14 +1837,16 @@ bool wxVariant::Convert(bool* value) const
 bool wxVariant::Convert(double* value) const
 {
     wxString type(GetType());
-    if (type == "double")
+    if (type == wxT("double"))
         *value = ((wxVariantDataReal*)GetData())->GetValue();
-    else if (type == "long")
+    else if (type == wxT("long"))
         *value = (double) (((wxVariantDataLong*)GetData())->GetValue());
-    else if (type == "bool")
+#ifdef HAVE_BOOL
+    else if (type == wxT("bool"))
         *value = (double) (((wxVariantDataBool*)GetData())->GetValue());
-    else if (type == "string")
-        *value = (double) atof((const char*) ((wxVariantDataString*)GetData())->GetValue());
+#endif
+    else if (type == wxT("string"))
+        *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
         return FALSE;
 
@@ -1736,12 +1856,14 @@ bool wxVariant::Convert(double* value) const
 bool wxVariant::Convert(char* value) const
 {
     wxString type(GetType());
-    if (type == "char")
+    if (type == wxT("char"))
         *value = ((wxVariantDataChar*)GetData())->GetValue();
-    else if (type == "long")
+    else if (type == wxT("long"))
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());
-    else if (type == "bool")
+#ifdef HAVE_BOOL
+    else if (type == wxT("bool"))
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
+#endif
     else
         return FALSE;
 
@@ -1754,13 +1876,14 @@ bool wxVariant::Convert(wxString* value) const
     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());
-    if (type == "time")
+    if (type == wxT("time"))
         *value = ((wxVariantDataTime*)GetData())->GetValue();
-    else if (type == "date")
+    else if (type == wxT("date"))
         *value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
     else
         return FALSE;
@@ -1771,7 +1894,7 @@ bool wxVariant::Convert(wxTime* value) const
 bool wxVariant::Convert(wxDate* value) const
 {
     wxString type(GetType());
-    if (type == "date")
+    if (type == wxT("date"))
         *value = ((wxVariantDataDate*)GetData())->GetValue();
     else
         return FALSE;
@@ -1780,3 +1903,4 @@ bool wxVariant::Convert(wxDate* value) const
 }
 #endif
  // wxUSE_TIMEDATE
+