X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b004197c8cea40b41632e86cf27857463f985b8..82e94f591f2638b07a4f28c096d94ec7e8571c20:/src/common/variant.cpp diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 193612e598..c38fef7a8d 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -36,6 +36,8 @@ #endif #include "wx/string.h" +#include "wx/tokenzr.h" + #include "wx/variant.h" #if wxUSE_TIMEDATE @@ -99,23 +101,23 @@ wxVariantDataList::~wxVariantDataList() void wxVariantDataList::SetValue(const wxList& value) { Clear(); - wxNode* node = value.First(); + wxNode* node = value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->Data(); + wxVariant* var = (wxVariant*) node->GetData(); m_value.Append(new wxVariant(*var)); - node = node->Next(); + node = node->GetNext(); } } void wxVariantDataList::Clear() { - wxNode* node = m_value.First(); + wxNode* node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->Data(); + wxVariant* var = (wxVariant*) node->GetData(); delete var; - node = node->Next(); + node = node->GetNext(); } m_value.Clear(); } @@ -127,12 +129,12 @@ void wxVariantDataList::Copy(wxVariantData& data) wxVariantDataList& listData = (wxVariantDataList&) data; listData.Clear(); - wxNode* node = m_value.First(); + wxNode* node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->Data(); + wxVariant* var = (wxVariant*) node->GetData(); listData.m_value.Append(new wxVariant(*var)); - node = node->Next(); + node = node->GetNext(); } } @@ -141,19 +143,19 @@ bool wxVariantDataList::Eq(wxVariantData& data) const wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") ); wxVariantDataList& listData = (wxVariantDataList&) data; - wxNode* node1 = m_value.First(); - wxNode* node2 = listData.GetValue().First(); + wxNode* node1 = m_value.GetFirst(); + wxNode* node2 = listData.GetValue().GetFirst(); while (node1 && node2) { - wxVariant* var1 = (wxVariant*) node1->Data(); - wxVariant* var2 = (wxVariant*) node2->Data(); + wxVariant* var1 = (wxVariant*) node1->GetData(); + wxVariant* var2 = (wxVariant*) node2->GetData(); if ((*var1) != (*var2)) - return FALSE; - node1 = node1->Next(); - node2 = node2->Next(); + return false; + node1 = node1->GetNext(); + node2 = node2->GetNext(); } - if (node1 || node2) return FALSE; - return TRUE; + if (node1 || node2) return false; + return true; } #if wxUSE_STD_IOSTREAM @@ -162,25 +164,25 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataList::Write(wxString& str) const { str = wxT(""); - wxNode* node = m_value.First(); + wxNode* node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->Data(); - if (node != m_value.First()) + wxVariant* var = (wxVariant*) node->GetData(); + if (node != m_value.GetFirst()) str += wxT(" "); wxString str1; str += var->MakeString(); - node = node->Next(); + node = node->GetNext(); } - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM @@ -188,7 +190,7 @@ bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } #endif @@ -196,7 +198,7 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } /* @@ -250,19 +252,19 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const 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(); + wxStringList::Node *node1 = m_value.GetFirst(); + wxStringList::Node *node2 = listData.GetValue().GetFirst(); while (node1 && node2) { - wxString str1 ((wxChar*) node1->Data()); - wxString str2 ((wxChar*) node2->Data()); + wxString str1 ( node1->GetData() ); + wxString str2 ( node2->GetData() ); if (str1 != str2) - return FALSE; - node1 = node1->Next(); - node2 = node2->Next(); + return false; + node1 = node1->GetNext(); + node2 = node2->GetNext(); } - if (node1 || node2) return FALSE; - return TRUE; + if (node1 || node2) return false; + return true; } #if wxUSE_STD_IOSTREAM @@ -271,24 +273,24 @@ bool wxVariantDataStringList::Write(wxSTD ostream& str) const wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataStringList::Write(wxString& str) const { - str = wxT(""); - wxNode* node = m_value.First(); + str.Empty(); + wxStringList::Node *node = m_value.GetFirst(); while (node) { - wxChar* s = (wxChar*) node->Data(); - if (node != m_value.First()) + wxChar* s = node->GetData(); + if (node != m_value.GetFirst()) str += wxT(" "); str += s; - node = node->Next(); + node = node->GetNext(); } - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM @@ -296,7 +298,7 @@ bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } #endif @@ -304,7 +306,7 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } /* @@ -367,21 +369,21 @@ bool wxVariantDataLong::Write(wxSTD ostream& str) const wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataLong::Write(wxString& str) const { str.Printf(wxT("%ld"), m_value); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM bool wxVariantDataLong::Read(wxSTD istream& str) { str >> m_value; - return TRUE; + return true; } #endif @@ -391,21 +393,21 @@ bool wxVariantDataLong::Write(wxOutputStream& str) const wxTextOutputStream s(str); s.Write32((size_t)m_value); - return TRUE; + return true; } bool wxVariantDataLong::Read(wxInputStream& str) { wxTextInputStream s(str); m_value = s.Read32(); - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataLong::Read(wxString& str) { m_value = wxAtol((const wxChar*) str); - return TRUE; + return true; } /* @@ -468,21 +470,21 @@ bool wxVariantDataReal::Write(wxSTD ostream& str) const wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataReal::Write(wxString& str) const { str.Printf(wxT("%.4f"), m_value); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM bool wxVariantDataReal::Read(wxSTD istream& str) { str >> m_value; - return TRUE; + return true; } #endif @@ -491,21 +493,21 @@ bool wxVariantDataReal::Write(wxOutputStream& str) const { wxTextOutputStream s(str); s.WriteDouble((double)m_value); - return TRUE; + return true; } bool wxVariantDataReal::Read(wxInputStream& str) { wxTextInputStream s(str); m_value = (float)s.ReadDouble(); - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataReal::Read(wxString& str) { m_value = wxAtof((const wxChar*) str); - return TRUE; + return true; } #ifdef HAVE_BOOL @@ -569,14 +571,14 @@ bool wxVariantDataBool::Write(wxSTD ostream& str) const wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataBool::Write(wxString& str) const { str.Printf(wxT("%d"), (int) m_value); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM @@ -584,7 +586,7 @@ bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // str >> (long) m_value; - return FALSE; + return false; } #endif @@ -594,7 +596,7 @@ bool wxVariantDataBool::Write(wxOutputStream& str) const wxTextOutputStream s(str); s.Write8(m_value); - return TRUE; + return true; } bool wxVariantDataBool::Read(wxInputStream& str) @@ -602,14 +604,14 @@ bool wxVariantDataBool::Read(wxInputStream& str) wxTextInputStream s(str); m_value = s.Read8() != 0; - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataBool::Read(wxString& str) { m_value = (wxAtol((const wxChar*) str) != 0); - return TRUE; + return true; } #endif // HAVE_BOOL @@ -671,14 +673,14 @@ bool wxVariantDataChar::Write(wxSTD ostream& str) const wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataChar::Write(wxString& str) const { str.Printf(wxT("%c"), m_value); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM @@ -686,7 +688,7 @@ bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // str >> m_value; - return FALSE; + return false; } #endif @@ -696,7 +698,7 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const wxTextOutputStream s(str); s.Write8(m_value); - return TRUE; + return true; } bool wxVariantDataChar::Read(wxInputStream& str) @@ -704,14 +706,14 @@ bool wxVariantDataChar::Read(wxInputStream& str) wxTextInputStream s(str); m_value = s.Read8(); - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataChar::Read(wxString& str) { m_value = str[(size_t)0]; - return TRUE; + return true; } /* @@ -779,21 +781,21 @@ bool wxVariantDataString::Eq(wxVariantData& data) const bool wxVariantDataString::Write(wxSTD ostream& str) const { str << (const char*) m_value.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataString::Write(wxString& str) const { str = m_value; - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM bool wxVariantDataString::Read(wxSTD istream& str) { str >> m_value; - return TRUE; + return true; } #endif @@ -803,7 +805,7 @@ bool wxVariantDataString::Write(wxOutputStream& str) const // why doesn't wxOutputStream::operator<< take "const wxString&" wxTextOutputStream s(str); s.WriteString(m_value); - return TRUE; + return true; } bool wxVariantDataString::Read(wxInputStream& str) @@ -811,14 +813,14 @@ bool wxVariantDataString::Read(wxInputStream& str) wxTextInputStream s(str); m_value = s.ReadString(); - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataString::Read(wxString& str) { m_value = str; - return TRUE; + return true; } #if defined(__BORLANDC__) && defined(__WIN16__) @@ -855,7 +857,7 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("time"); }; - virtual wxVariantData* Clone() { return new wxVariantDataTime; } + virtual wxVariantData* Clone() { return new wxVariantDataTime; } protected: wxTime m_value; @@ -887,7 +889,7 @@ bool wxVariantDataTime::Write(wxSTD ostream& str) const wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif @@ -895,21 +897,21 @@ bool wxVariantDataTime::Write(wxString& str) const { wxChar*s = m_value.FormatTime(); str = s; - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM bool wxVariantDataTime::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif bool wxVariantDataTime::Read(wxString& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } /* @@ -937,7 +939,7 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("date"); }; - virtual wxVariantData* Clone() { return new wxVariantDataDate; } + virtual wxVariantData* Clone() { return new wxVariantDataDate; } protected: wxDate m_value; @@ -969,28 +971,28 @@ bool wxVariantDataDate::Write(wxSTD ostream& str) const wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataDate::Write(wxString& str) const { str = m_value.FormatDate(); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM bool wxVariantDataDate::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif bool wxVariantDataDate::Read(wxString& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif // wxUSE_TIMEDATE @@ -1020,10 +1022,12 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("void*"); }; - virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } + virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } protected: void* m_value; + + DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr) }; IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData) @@ -1052,28 +1056,28 @@ bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataVoidPtr::Write(wxString& str) const { str.Printf(wxT("%ld"), (long) m_value); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } /* @@ -1144,7 +1148,7 @@ bool wxVariantDataDateTime::Eq(wxVariantData& data) const bool wxVariantDataDateTime::Write(wxSTD ostream& str) const { // Not implemented - return FALSE; + return false; } #endif @@ -1152,7 +1156,7 @@ bool wxVariantDataDateTime::Write(wxSTD ostream& str) const bool wxVariantDataDateTime::Write(wxString& str) const { str = m_value.Format(); - return TRUE; + return true; } @@ -1160,7 +1164,7 @@ bool wxVariantDataDateTime::Write(wxString& str) const bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif @@ -1168,9 +1172,108 @@ bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) bool wxVariantDataDateTime::Read(wxString& str) { if(! m_value.ParseDateTime(str)) - return FALSE; - return TRUE; + return false; + return true; +} + +// ---------------------------------------------------------------------------- +// wxVariantDataArrayString +// ---------------------------------------------------------------------------- + +class wxVariantDataArrayString: public wxVariantData +{ +public: + wxVariantDataArrayString() { } + wxVariantDataArrayString(const wxArrayString& value) { m_value = value; } + + wxArrayString GetValue() const { return m_value; } + void SetValue(const wxArrayString& value) { m_value = value; } + + virtual void Copy(wxVariantData& data); + virtual bool Eq(wxVariantData& data) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif + virtual bool Write(wxString& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif + virtual bool Read(wxString& str); + virtual wxString GetType() const { return wxT("arrstring"); }; + virtual wxVariantData* Clone() { return new wxVariantDataArrayString; } + +protected: + wxArrayString m_value; + + DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData) + +void wxVariantDataArrayString::Copy(wxVariantData& data) +{ + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Copy: Can't copy to this type of data") ); + + wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; + + otherData.m_value = m_value; +} + + +bool wxVariantDataArrayString::Eq(wxVariantData& data) const +{ + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") ); + + wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; + + return otherData.m_value == m_value; +} + + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataArrayString::Write(wxSTD ostream& str) const +{ + // Not implemented + return false; } +#endif + + +bool wxVariantDataArrayString::Write(wxString& str) const +{ + size_t count = m_value.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + if ( n ) + str += _T(';'); + + str += m_value[n]; + } + + return true; +} + + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) +{ + // Not implemented + return false; +} +#endif + + +bool wxVariantDataArrayString::Read(wxString& str) +{ + wxStringTokenizer tk(str, _T(";")); + while ( tk.HasMoreTokens() ) + { + m_value.Add(tk.GetNextToken()); + } + + return true; +} + /* @@ -1280,9 +1383,16 @@ wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date m_data = new wxVariantDataDateTime(valptr); m_name = name; } -#endif +#endif // wxUSE_ODBC + +wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings +{ + m_data = new wxVariantDataArrayString(val); + m_name = name; +} wxVariant::wxVariant(const wxVariant& variant) + : wxObject() { if (!variant.IsNull()) { @@ -1329,8 +1439,10 @@ void wxVariant::operator= (const wxVariant& variant) delete m_data; m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject(); } -// GetData()->Copy(* variant.GetData()); + variant.GetData()->Copy(* GetData()); + + m_name = variant.m_name; } // Assignment using data, e.g. @@ -1360,7 +1472,7 @@ bool wxVariant::operator== (double value) const { double thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1388,7 +1500,7 @@ bool wxVariant::operator== (long value) const { long thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1416,7 +1528,7 @@ bool wxVariant::operator== (char value) const { char thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1445,7 +1557,7 @@ bool wxVariant::operator== (bool value) const { bool thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1474,7 +1586,7 @@ bool wxVariant::operator== (const wxString& value) const { wxString thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; return value == thisValue; } @@ -1572,7 +1684,7 @@ bool wxVariant::operator== (const wxTime& value) const { wxTime thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; return value == thisValue; } @@ -1600,7 +1712,7 @@ bool wxVariant::operator== (const wxDate& value) const { wxDate thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; return (value == thisValue); } @@ -1653,7 +1765,7 @@ bool wxVariant::operator== (const wxDateTime& value) const { wxDateTime thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; return value.IsEqualTo(thisValue); } @@ -1677,7 +1789,6 @@ void wxVariant::operator= (const wxDateTime& value) } } - #if wxUSE_ODBC void wxVariant::operator= (const DATE_STRUCT* value) { @@ -1702,7 +1813,41 @@ void wxVariant::operator= (const TIMESTAMP_STRUCT* value) m_data = new wxVariantDataDateTime(value); } -#endif +#endif // wxUSE_ODBC + +bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const +{ + wxFAIL_MSG( _T("TODO") ); + + return false; +} + +bool wxVariant::operator!=(const wxArrayString& value) const +{ + return !(*this == value); +} + +void wxVariant::operator=(const wxArrayString& value) +{ + if (GetType() == wxT("arrstring")) + { + ((wxVariantDataArrayString *)GetData())->SetValue(value); + } + else + { + delete m_data; + m_data = new wxVariantDataArrayString(value); + } +} + +wxArrayString wxVariant::GetArrayString() const +{ + if ( GetType() == wxT("arrstring") ) + return ((wxVariantDataArrayString *)GetData())->GetValue(); + + return wxArrayString(); +} + // Treat a list variant as an array wxVariant wxVariant::operator[] (size_t idx) const @@ -1712,15 +1857,15 @@ wxVariant wxVariant::operator[] (size_t idx) const if (GetType() == wxT("list")) { wxVariantDataList* data = (wxVariantDataList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") ); - return * (wxVariant*) (data->GetValue().Nth(idx)->Data()); + wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); + return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); } else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") ); + wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); - wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) )); + wxVariant variant( wxString( (wxChar*) (data->GetValue().Item(idx)->GetData()) )); return variant; } return wxNullVariant; @@ -1734,9 +1879,9 @@ wxVariant& wxVariant::operator[] (size_t idx) wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") ); wxVariantDataList* data = (wxVariantDataList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") ); + wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); - return * (wxVariant*) (data->GetValue().Nth(idx)->Data()); + return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); } // Return the number of elements in a list @@ -1747,12 +1892,12 @@ int wxVariant::GetCount() const if (GetType() == wxT("list")) { wxVariantDataList* data = (wxVariantDataList*) m_data; - return data->GetValue().Number(); + return data->GetValue().GetCount(); } else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; - return data->GetValue().Number(); + return data->GetValue().GetCount(); } return 0; } @@ -1911,6 +2056,12 @@ wxStringList& wxVariant::GetStringList() const return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); } +// Make empty list +void wxVariant::NullList() +{ + SetData(new wxVariantDataList()); +}; + // Append to list void wxVariant::Append(const wxVariant& value) { @@ -1927,20 +2078,20 @@ void wxVariant::Insert(const wxVariant& value) list.Insert(new wxVariant(value)); } -// Returns TRUE if the variant is a member of the list +// Returns true if the variant is a member of the list bool wxVariant::Member(const wxVariant& value) const { wxList& list = GetList(); - wxNode* node = list.First(); + wxNode* node = list.GetFirst(); while (node) { - wxVariant* other = (wxVariant*) node->Data(); + wxVariant* other = (wxVariant*) node->GetData(); if (value == *other) - return TRUE; - node = node->Next(); + return true; + node = node->GetNext(); } - return FALSE; + return false; } // Deletes the nth element of the list @@ -1948,12 +2099,12 @@ bool wxVariant::Delete(int item) { wxList& list = GetList(); - wxASSERT_MSG( (item < list.Number()), wxT("Invalid index to Delete") ); - wxNode* node = list.Nth(item); - wxVariant* variant = (wxVariant*) node->Data(); + wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") ); + wxNode* node = list.Item(item); + wxVariant* variant = (wxVariant*) node->GetData(); delete variant; delete node; - return TRUE; + return true; } // Clear list @@ -1989,9 +2140,9 @@ bool wxVariant::Convert(long* value) const else if (type == wxT("string")) *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue()); else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(bool* value) const @@ -2010,16 +2161,16 @@ bool wxVariant::Convert(bool* value) const wxString val(((wxVariantDataString*)GetData())->GetValue()); val.MakeLower(); if (val == wxT("true") || val == wxT("yes")) - *value = TRUE; + *value = true; else if (val == wxT("false") || val == wxT("no")) - *value = FALSE; + *value = false; else - return FALSE; + return false; } else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(double* value) const @@ -2036,9 +2187,9 @@ bool wxVariant::Convert(double* value) const else if (type == wxT("string")) *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue()); else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(char* value) const @@ -2053,15 +2204,15 @@ bool wxVariant::Convert(char* value) const *value = (char) (((wxVariantDataBool*)GetData())->GetValue()); #endif else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(wxString* value) const { *value = MakeString(); - return TRUE; + return true; } // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled @@ -2074,9 +2225,9 @@ bool wxVariant::Convert(wxTime* value) const else if (type == wxT("date")) *value = wxTime(((wxVariantDataDate*)GetData())->GetValue()); else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(wxDate* value) const @@ -2085,9 +2236,9 @@ bool wxVariant::Convert(wxDate* value) const if (type == wxT("date")) *value = ((wxVariantDataDate*)GetData())->GetValue(); else - return FALSE; + return false; - return TRUE; + return true; } #endif // wxUSE_TIMEDATE @@ -2095,9 +2246,11 @@ bool wxVariant::Convert(wxDateTime* value) const { wxString type(GetType()); if (type == wxT("datetime")) + { *value = ((wxVariantDataDateTime*)GetData())->GetValue(); - else - return FALSE; - - return TRUE; + return true; + } + // Fallback to string conversion + wxString val; + return Convert(&val) && (value->ParseDate(val)); }