X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fae05df5a988883e9c6683ccded766dfb7b84b1b..963a1fcd6e013eef52bf87ed99e19d9ab49563ef:/src/common/variant.cpp diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 17a9980397..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,10 +22,12 @@ #pragma hdrstop #endif -#if wxUSE_IOSTREAMH && wxUSE_STD_IOSTREAM -# include -#else -# include +#if wxUSE_STD_IOSTREAM + #if wxUSE_IOSTREAMH + #include + #else + #include + #endif #endif #if wxUSE_STREAMS @@ -34,6 +38,15 @@ #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; @@ -63,7 +76,7 @@ public: virtual bool Read(istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return _T("list"); }; + virtual wxString GetType() const { return wxT("list"); }; void Clear(); @@ -109,7 +122,7 @@ void wxVariantDataList::Clear() 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; @@ -125,7 +138,7 @@ void wxVariantDataList::Copy(wxVariantData& data) 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(); @@ -155,13 +168,13 @@ bool wxVariantDataList::Write(ostream& 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()) - str += _T(" "); + str += wxT(" "); wxString str1; str += var->MakeString(); node = node->Next(); @@ -173,7 +186,7 @@ bool wxVariantDataList::Write(wxString& str) const #if wxUSE_STD_IOSTREAM bool wxVariantDataList::Read(istream& WXUNUSED(str)) { - wxFAIL_MSG(_T("Unimplemented")); + wxFAIL_MSG(wxT("Unimplemented")); // TODO return FALSE; } @@ -181,7 +194,7 @@ bool wxVariantDataList::Read(istream& WXUNUSED(str)) bool wxVariantDataList::Read(wxString& WXUNUSED(str)) { - wxFAIL_MSG(_T("Unimplemented")); + wxFAIL_MSG(wxT("Unimplemented")); // TODO return FALSE; } @@ -210,7 +223,7 @@ public: virtual bool Read(istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return _T("stringlist"); }; + virtual wxString GetType() const { return wxT("stringlist"); }; protected: wxStringList m_value; @@ -225,7 +238,7 @@ void wxVariantDataStringList::SetValue(const wxStringList& value) 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; @@ -234,7 +247,7 @@ void wxVariantDataStringList::Copy(wxVariantData& data) 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(); @@ -264,13 +277,13 @@ bool wxVariantDataStringList::Write(ostream& 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()) - str += _T(" "); + str += wxT(" "); str += s; node = node->Next(); } @@ -281,7 +294,7 @@ bool wxVariantDataStringList::Write(wxString& str) const #if wxUSE_STD_IOSTREAM bool wxVariantDataStringList::Read(istream& WXUNUSED(str)) { - wxFAIL_MSG(_T("Unimplemented")); + wxFAIL_MSG(wxT("Unimplemented")); // TODO return FALSE; } @@ -289,7 +302,7 @@ bool wxVariantDataStringList::Read(istream& WXUNUSED(str)) bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) { - wxFAIL_MSG(_T("Unimplemented")); + wxFAIL_MSG(wxT("Unimplemented")); // TODO return FALSE; } @@ -322,7 +335,7 @@ public: 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; @@ -332,7 +345,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData) 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; @@ -341,7 +354,7 @@ void wxVariantDataLong::Copy(wxVariantData& data) 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; @@ -360,7 +373,7 @@ bool wxVariantDataLong::Write(ostream& str) const bool wxVariantDataLong::Write(wxString& str) const { - str.Printf(_T("%ld"), m_value); + str.Printf(wxT("%ld"), m_value); return TRUE; } @@ -377,7 +390,7 @@ bool wxVariantDataLong::Write(wxOutputStream& str) const { wxTextOutputStream s(str); - s.Write32(m_value); + s.Write32((size_t)m_value); return TRUE; } @@ -423,7 +436,7 @@ public: 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; @@ -433,7 +446,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData) 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; @@ -442,7 +455,7 @@ void wxVariantDataReal::Copy(wxVariantData& data) 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; @@ -461,7 +474,7 @@ bool wxVariantDataReal::Write(ostream& str) const bool wxVariantDataReal::Write(wxString& str) const { - str.Printf(_T("%.4f"), m_value); + str.Printf(wxT("%.4f"), m_value); return TRUE; } @@ -524,7 +537,7 @@ public: 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; @@ -534,7 +547,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData) 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; @@ -543,7 +556,7 @@ void wxVariantDataBool::Copy(wxVariantData& data) 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; @@ -562,14 +575,14 @@ bool wxVariantDataBool::Write(ostream& str) const bool wxVariantDataBool::Write(wxString& str) const { - str.Printf(_T("%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(_T("Unimplemented")); + wxFAIL_MSG(wxT("Unimplemented")); // str >> (long) m_value; return FALSE; } @@ -588,7 +601,7 @@ bool wxVariantDataBool::Read(wxInputStream& str) { wxTextInputStream s(str); - m_value = s.Read8(); + m_value = s.Read8() != 0; return TRUE; } #endif // wxUSE_STREAMS @@ -626,7 +639,7 @@ public: 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; @@ -636,7 +649,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData) 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; @@ -645,7 +658,7 @@ void wxVariantDataChar::Copy(wxVariantData& data) 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; @@ -664,14 +677,14 @@ bool wxVariantDataChar::Write(ostream& str) const bool wxVariantDataChar::Write(wxString& str) const { - str.Printf(_T("%c"), m_value); + str.Printf(wxT("%c"), m_value); return TRUE; } #if wxUSE_STD_IOSTREAM bool wxVariantDataChar::Read(istream& WXUNUSED(str)) { - wxFAIL_MSG(_T("Unimplemented")); + wxFAIL_MSG(wxT("Unimplemented")); // str >> m_value; return FALSE; } @@ -738,7 +751,7 @@ public: 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; @@ -746,7 +759,7 @@ protected: 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; @@ -755,7 +768,7 @@ void wxVariantDataString::Copy(wxVariantData& data) 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; @@ -818,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 { @@ -840,7 +854,7 @@ public: virtual bool Read(istream& str); #endif 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: @@ -851,7 +865,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData) 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; @@ -860,7 +874,7 @@ void wxVariantDataTime::Copy(wxVariantData& data) 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; @@ -922,7 +936,7 @@ public: virtual bool Read(istream& str); #endif 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: @@ -933,7 +947,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData) 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; @@ -942,7 +956,7 @@ void wxVariantDataDate::Copy(wxVariantData& data) 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; @@ -1005,7 +1019,7 @@ public: virtual bool Read(istream& str); #endif 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: @@ -1016,7 +1030,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData) 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; @@ -1025,7 +1039,7 @@ void wxVariantDataVoidPtr::Copy(wxVariantData& data) 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; @@ -1044,7 +1058,7 @@ bool wxVariantDataVoidPtr::Write(ostream& str) const bool wxVariantDataVoidPtr::Write(wxString& str) const { - str.Printf(_T("%ld"), (long) m_value); + str.Printf(wxT("%ld"), (long) m_value); return TRUE; } @@ -1125,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); @@ -1235,7 +1250,7 @@ bool wxVariant::operator!= (double value) const void wxVariant::operator= (double value) { - if (GetType() == _T("double")) + if (GetType() == wxT("double")) { ((wxVariantDataReal*)GetData())->SetValue(value); } @@ -1263,7 +1278,7 @@ bool wxVariant::operator!= (long value) const void wxVariant::operator= (long value) { - if (GetType() == _T("long")) + if (GetType() == wxT("long")) { ((wxVariantDataLong*)GetData())->SetValue(value); } @@ -1291,7 +1306,7 @@ bool wxVariant::operator!= (char value) const void wxVariant::operator= (char value) { - if (GetType() == _T("char")) + if (GetType() == wxT("char")) { ((wxVariantDataChar*)GetData())->SetValue(value); } @@ -1320,7 +1335,7 @@ bool wxVariant::operator!= (bool value) const void wxVariant::operator= (bool value) { - if (GetType() == _T("bool")) + if (GetType() == wxT("bool")) { ((wxVariantDataBool*)GetData())->SetValue(value); } @@ -1338,8 +1353,8 @@ 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 @@ -1349,7 +1364,7 @@ bool wxVariant::operator!= (const wxString& value) const void wxVariant::operator= (const wxString& value) { - if (GetType() == _T("string")) + if (GetType() == wxT("string")) { ((wxVariantDataString*)GetData())->SetValue(value); } @@ -1363,7 +1378,7 @@ void wxVariant::operator= (const wxString& value) void wxVariant::operator= (const wxChar* value) { - if (GetType() == _T("string")) + if (GetType() == wxT("string")) { ((wxVariantDataString*)GetData())->SetValue(wxString(value)); } @@ -1377,7 +1392,7 @@ void wxVariant::operator= (const wxChar* value) 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)); @@ -1390,7 +1405,7 @@ bool wxVariant::operator!= (const wxStringList& value) const void wxVariant::operator= (const wxStringList& value) { - if (GetType() == _T("stringlist")) + if (GetType() == wxT("stringlist")) { ((wxVariantDataStringList*)GetData())->SetValue(value); } @@ -1404,7 +1419,7 @@ void wxVariant::operator= (const wxStringList& value) 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)); @@ -1417,7 +1432,7 @@ bool wxVariant::operator!= (const wxList& value) const void wxVariant::operator= (const wxList& value) { - if (GetType() == _T("list")) + if (GetType() == wxT("list")) { ((wxVariantDataList*)GetData())->SetValue(value); } @@ -1429,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 @@ -1446,7 +1462,7 @@ bool wxVariant::operator!= (const wxTime& value) const void wxVariant::operator= (const wxTime& value) { - if (GetType() == _T("time")) + if (GetType() == wxT("time")) { ((wxVariantDataTime*)GetData())->SetValue(value); } @@ -1463,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 @@ -1474,7 +1490,7 @@ bool wxVariant::operator!= (const wxDate& value) const void wxVariant::operator= (const wxDate& value) { - if (GetType() == _T("date")) + if (GetType() == wxT("date")) { ((wxVariantDataTime*)GetData())->SetValue(value); } @@ -1494,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() == _T("void*")) + if (GetType() == wxT("void*")) { ((wxVariantDataVoidPtr*)GetData())->SetValue(value); } @@ -1514,18 +1530,18 @@ void wxVariant::operator= (void* value) // 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; - 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()); } - else if (GetType() == _T("stringlist")) + else if (GetType() == wxT("stringlist")) { 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; @@ -1538,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() == _T("list")), _T("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()), _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()); } @@ -1549,14 +1565,14 @@ wxVariant& wxVariant::operator[] (size_t idx) // 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(); } - else if (GetType() == _T("stringlist")) + else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; return data->GetValue().Number(); @@ -1572,7 +1588,7 @@ wxString wxVariant::MakeString() const if (GetData()->Write(str)) return str; } - return wxString(_T("")); + return wxString(wxT("")); } // Accessors @@ -1589,7 +1605,7 @@ void wxVariant::SetData(wxVariantData* data) wxString wxVariant::GetType() const { if (IsNull()) - return wxString(_T("null")); + return wxString(wxT("null")); else return m_data->GetType(); } @@ -1609,7 +1625,7 @@ double wxVariant::GetReal() const 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; } } @@ -1621,7 +1637,7 @@ long wxVariant::GetInteger() const return value; else { - wxFAIL_MSG(_T("Could not convert to an integer")); + wxFAIL_MSG(wxT("Could not convert to an integer")); return 0; } } @@ -1633,7 +1649,7 @@ char wxVariant::GetChar() const return value; else { - wxFAIL_MSG(_T("Could not convert to a char")); + wxFAIL_MSG(wxT("Could not convert to a char")); return 0; } } @@ -1645,7 +1661,7 @@ bool wxVariant::GetBool() const return value; else { - wxFAIL_MSG(_T("Could not convert to a bool")); + wxFAIL_MSG(wxT("Could not convert to a bool")); return 0; } } @@ -1653,58 +1669,56 @@ bool wxVariant::GetBool() const 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; - 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; - 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 { - wxASSERT( (GetType() == _T("void*")) ); + wxASSERT( (GetType() == wxT("void*")) ); return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); } wxList& wxVariant::GetList() const { - wxASSERT( (GetType() == _T("list")) ); + wxASSERT( (GetType() == wxT("list")) ); return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); } wxStringList& wxVariant::GetStringList() const { - wxASSERT( (GetType() == _T("stringlist")) ); + wxASSERT( (GetType() == wxT("stringlist")) ); return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); } @@ -1746,7 +1760,7 @@ bool wxVariant::Delete(int item) { 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; @@ -1757,13 +1771,13 @@ bool wxVariant::Delete(int item) // Clear list void wxVariant::ClearList() { - if (!IsNull() && (GetType() == _T("list"))) + if (!IsNull() && (GetType() == wxT("list"))) { ((wxVariantDataList*) m_data)->Clear(); } else { - if (GetType() != _T("list")) + if (GetType() != wxT("list")) { delete m_data; m_data = NULL; @@ -1776,15 +1790,15 @@ void wxVariant::ClearList() bool wxVariant::Convert(long* value) const { wxString type(GetType()); - if (type == _T("double")) + if (type == wxT("double")) *value = (long) (((wxVariantDataReal*)GetData())->GetValue()); - else if (type == _T("long")) + else if (type == wxT("long")) *value = ((wxVariantDataLong*)GetData())->GetValue(); #ifdef HAVE_BOOL - else if (type == _T("bool")) + else if (type == wxT("bool")) *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; @@ -1795,21 +1809,21 @@ bool wxVariant::Convert(long* value) const bool wxVariant::Convert(bool* value) const { wxString type(GetType()); - if (type == _T("double")) + if (type == wxT("double")) *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0); - else if (type == _T("long")) + else if (type == wxT("long")) *value = (((wxVariantDataLong*)GetData())->GetValue() != 0); #ifdef HAVE_BOOL - else if (type == _T("bool")) + else if (type == wxT("bool")) *value = ((wxVariantDataBool*)GetData())->GetValue(); #endif - else if (type == _T("string")) + else if (type == wxT("string")) { wxString val(((wxVariantDataString*)GetData())->GetValue()); val.MakeLower(); - if (val == _T("true") || val == _T("yes")) + if (val == wxT("true") || val == wxT("yes")) *value = TRUE; - else if (val == _T("false") || val == _T("no")) + else if (val == wxT("false") || val == wxT("no")) *value = FALSE; else return FALSE; @@ -1823,15 +1837,15 @@ bool wxVariant::Convert(bool* value) const bool wxVariant::Convert(double* value) const { wxString type(GetType()); - if (type == _T("double")) + if (type == wxT("double")) *value = ((wxVariantDataReal*)GetData())->GetValue(); - else if (type == _T("long")) + else if (type == wxT("long")) *value = (double) (((wxVariantDataLong*)GetData())->GetValue()); #ifdef HAVE_BOOL - else if (type == _T("bool")) + else if (type == wxT("bool")) *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; @@ -1842,12 +1856,12 @@ bool wxVariant::Convert(double* value) const bool wxVariant::Convert(char* value) const { wxString type(GetType()); - if (type == _T("char")) + if (type == wxT("char")) *value = ((wxVariantDataChar*)GetData())->GetValue(); - else if (type == _T("long")) + else if (type == wxT("long")) *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 @@ -1862,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 == _T("time")) + if (type == wxT("time")) *value = ((wxVariantDataTime*)GetData())->GetValue(); - else if (type == _T("date")) + else if (type == wxT("date")) *value = wxTime(((wxVariantDataDate*)GetData())->GetValue()); else return FALSE; @@ -1879,7 +1894,7 @@ bool wxVariant::Convert(wxTime* value) const bool wxVariant::Convert(wxDate* value) const { wxString type(GetType()); - if (type == _T("date")) + if (type == wxT("date")) *value = ((wxVariantDataDate*)GetData())->GetValue(); else return FALSE; @@ -1888,3 +1903,4 @@ bool wxVariant::Convert(wxDate* value) const } #endif // wxUSE_TIMEDATE +