X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ab25aca26bffe363b1f76623c736602a70eb56f..dc497201eb08e3de1402480e2ab97a6405335ecb:/src/common/variant.cpp diff --git a/src/common/variant.cpp b/src/common/variant.cpp index c6a70f2a33..b9139f68a9 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "variant.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -28,6 +24,11 @@ #endif #endif +#if defined(__MWERKS__) && __MSL__ >= 0x6000 +namespace std {} +using namespace std ; +#endif + #if wxUSE_STREAMS #include "wx/stream.h" #include "wx/txtstrm.h" @@ -35,18 +36,19 @@ #include "wx/string.h" #include "wx/tokenzr.h" +#include "wx/math.h" #include "wx/variant.h" IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject) -wxVariant WXDLLEXPORT wxNullVariant; +wxVariant WXDLLIMPEXP_BASE wxNullVariant; /* * wxVariantDataList */ -class WXDLLEXPORT wxVariantDataList: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataList) public: @@ -54,7 +56,7 @@ public: wxVariantDataList(const wxList& list); ~wxVariantDataList(); - wxList& GetValue() const { return (wxList&) m_value; } + wxList& GetValue() { return m_value; } void SetValue(const wxList& value) ; virtual void Copy(wxVariantData& data); @@ -90,7 +92,7 @@ wxVariantDataList::~wxVariantDataList() void wxVariantDataList::SetValue(const wxList& value) { Clear(); - wxNode* node = value.GetFirst(); + wxList::compatibility_iterator node = value.GetFirst(); while (node) { wxVariant* var = (wxVariant*) node->GetData(); @@ -101,7 +103,7 @@ void wxVariantDataList::SetValue(const wxList& value) void wxVariantDataList::Clear() { - wxNode* node = m_value.GetFirst(); + wxList::compatibility_iterator node = m_value.GetFirst(); while (node) { wxVariant* var = (wxVariant*) node->GetData(); @@ -118,7 +120,7 @@ void wxVariantDataList::Copy(wxVariantData& data) wxVariantDataList& listData = (wxVariantDataList&) data; listData.Clear(); - wxNode* node = m_value.GetFirst(); + wxList::compatibility_iterator node = m_value.GetFirst(); while (node) { wxVariant* var = (wxVariant*) node->GetData(); @@ -132,19 +134,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.GetFirst(); - wxNode* node2 = listData.GetValue().GetFirst(); + wxList::compatibility_iterator node1 = m_value.GetFirst(); + wxList::compatibility_iterator node2 = listData.GetValue().GetFirst(); while (node1 && node2) { wxVariant* var1 = (wxVariant*) node1->GetData(); wxVariant* var2 = (wxVariant*) node2->GetData(); if ((*var1) != (*var2)) - return FALSE; + 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 @@ -153,14 +155,14 @@ 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.GetFirst(); + str = wxEmptyString; + wxList::compatibility_iterator node = m_value.GetFirst(); while (node) { wxVariant* var = (wxVariant*) node->GetData(); @@ -171,7 +173,7 @@ bool wxVariantDataList::Write(wxString& str) const node = node->GetNext(); } - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM @@ -179,7 +181,7 @@ bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } #endif @@ -187,14 +189,15 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } +#if WXWIN_COMPATIBILITY_2_4 /* * wxVariantDataStringList */ -class WXDLLEXPORT wxVariantDataStringList: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataStringList) public: @@ -241,19 +244,19 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") ); wxVariantDataStringList& listData = (wxVariantDataStringList&) data; - wxStringList::Node *node1 = m_value.GetFirst(); - wxStringList::Node *node2 = listData.GetValue().GetFirst(); + wxStringList::compatibility_iterator node1 = m_value.GetFirst(); + wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst(); while (node1 && node2) { wxString str1 ( node1->GetData() ); wxString str2 ( node2->GetData() ); if (str1 != str2) - return FALSE; + 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 @@ -262,24 +265,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.Empty(); - wxStringList::Node *node = m_value.GetFirst(); + wxStringList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxChar* s = node->GetData(); + const wxChar* s = node->GetData(); if (node != m_value.GetFirst()) str += wxT(" "); str += s; node = node->GetNext(); } - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM @@ -287,7 +290,7 @@ bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } #endif @@ -295,14 +298,16 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } +#endif //2.4 compat + /* * wxVariantDataLong */ -class WXDLLEXPORT wxVariantDataLong: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataLong) public: @@ -358,21 +363,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 @@ -382,28 +387,28 @@ 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; } /* * wxVariantDataReal */ -class WXDLLEXPORT wxVariantDataReal: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataReal) public: @@ -450,7 +455,7 @@ bool wxVariantDataReal::Eq(wxVariantData& data) const wxVariantDataReal& otherData = (wxVariantDataReal&) data; - return (otherData.m_value == m_value); + return wxIsSameDouble(otherData.m_value, m_value); } #if wxUSE_STD_IOSTREAM @@ -459,21 +464,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 @@ -482,21 +487,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 @@ -504,7 +509,7 @@ bool wxVariantDataReal::Read(wxString& str) * wxVariantDataBool */ -class WXDLLEXPORT wxVariantDataBool: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataBool) public: @@ -560,14 +565,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 @@ -575,7 +580,7 @@ bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // str >> (long) m_value; - return FALSE; + return false; } #endif @@ -585,7 +590,7 @@ bool wxVariantDataBool::Write(wxOutputStream& str) const wxTextOutputStream s(str); s.Write8(m_value); - return TRUE; + return true; } bool wxVariantDataBool::Read(wxInputStream& str) @@ -593,14 +598,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 @@ -608,7 +613,7 @@ bool wxVariantDataBool::Read(wxString& str) * wxVariantDataChar */ -class WXDLLEXPORT wxVariantDataChar: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataChar) public: @@ -662,14 +667,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 @@ -677,7 +682,7 @@ bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // str >> m_value; - return FALSE; + return false; } #endif @@ -687,7 +692,7 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const wxTextOutputStream s(str); s.Write8(m_value); - return TRUE; + return true; } bool wxVariantDataChar::Read(wxInputStream& str) @@ -695,32 +700,23 @@ 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; + m_value = str.ToAscii()[size_t(0)]; + return true; } /* * wxVariantDataString */ -#if defined(__BORLANDC__) && defined(__WIN16__) -// Change name because of truncation -#define wxVariantDataString wxVariantStringData -#endif - -class WXDLLEXPORT wxVariantDataString: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData { -#if defined(__BORLANDC__) && defined(__WIN16__) -DECLARE_DYNAMIC_CLASS(wxVariantStringData) -#else DECLARE_DYNAMIC_CLASS(wxVariantDataString) -#endif public: wxVariantDataString() { } wxVariantDataString(const wxString& value) { m_value = value; } @@ -770,21 +766,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 @@ -794,7 +790,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) @@ -802,21 +798,17 @@ 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__) -IMPLEMENT_DYNAMIC_CLASS(wxVariantStringData, wxVariantData) -#else IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) -#endif /* * wxVariantDataVoidPtr @@ -877,30 +869,135 @@ 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; + str.Printf(wxT("%p"), m_value); + 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; +} + +/* + * wxVariantDataWxObjectPtr + */ + +class wxVariantDataWxObjectPtr: public wxVariantData +{ +DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr) +public: + wxVariantDataWxObjectPtr() { } + wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; } + + inline wxObject* GetValue() const { return m_value; } + inline void SetValue(wxObject* 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 ; + virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; } + + virtual wxClassInfo* GetValueClassInfo() ; +protected: + wxObject* m_value; + + DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData) + +void wxVariantDataWxObjectPtr::Copy(wxVariantData& data) +{ + wxASSERT_MSG( wxIsKindOf((&data), wxVariantDataWxObjectPtr) ,\ + wxT("wxVariantDataWxObjectPtr::Copy: Can't copy to this type of data") \ + ); + + wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data; + + otherData.m_value = m_value; +} + +bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const +{ + wxASSERT_MSG( wxIsKindOf((&data), wxVariantDataWxObjectPtr), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") ); + + wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data; + + return (otherData.m_value == m_value); +} + +wxString wxVariantDataWxObjectPtr::GetType() const +{ + wxString returnVal(wxT("wxObject")); + if (m_value) { + returnVal = m_value->GetClassInfo()->GetClassName(); + } + return returnVal; +} + +wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo() +{ + wxClassInfo* returnVal=NULL; + + if (m_value) returnVal = m_value->GetClassInfo(); + + return returnVal; +} + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const +{ + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; +} +#endif + +bool wxVariantDataWxObjectPtr::Write(wxString& str) const +{ + str.Printf(wxT("%s(%p)"), GetType().c_str(), m_value); + return true; +} + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str)) +{ + // Not implemented + return false; +} +#endif + +bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str)) +{ + // Not implemented + return false; } + /* * wxVariantDataDateTime */ @@ -921,7 +1018,7 @@ public: { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); } wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr) { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year, - valptr->hour, valptr->minute, valptr->second, valptr->fraction ); } + valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); } #endif //ODBC inline wxDateTime GetValue() const { return m_value; } @@ -968,10 +1065,10 @@ bool wxVariantDataDateTime::Eq(wxVariantData& data) const #if wxUSE_STD_IOSTREAM -bool wxVariantDataDateTime::Write(wxSTD ostream& str) const +bool wxVariantDataDateTime::Write(wxSTD ostream& WXUNUSED(str)) const { // Not implemented - return FALSE; + return false; } #endif @@ -979,7 +1076,7 @@ bool wxVariantDataDateTime::Write(wxSTD ostream& str) const bool wxVariantDataDateTime::Write(wxString& str) const { str = m_value.Format(); - return TRUE; + return true; } @@ -987,7 +1084,7 @@ bool wxVariantDataDateTime::Write(wxString& str) const bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif @@ -995,8 +1092,8 @@ 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; } #endif // wxUSE_DATETIME @@ -1056,10 +1153,10 @@ bool wxVariantDataArrayString::Eq(wxVariantData& data) const #if wxUSE_STD_IOSTREAM -bool wxVariantDataArrayString::Write(wxSTD ostream& str) const +bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(str)) const { // Not implemented - return FALSE; + return false; } #endif @@ -1075,7 +1172,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const str += m_value[n]; } - return TRUE; + return true; } @@ -1083,7 +1180,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif @@ -1096,7 +1193,7 @@ bool wxVariantDataArrayString::Read(wxString& str) m_value.Add(tk.GetNextToken()); } - return TRUE; + return true; } @@ -1151,18 +1248,42 @@ wxVariant::wxVariant(const wxChar* val, const wxString& name) m_name = name; } +#if WXWIN_COMPATIBILITY_2_4 + wxVariant::wxVariant(const wxStringList& val, const wxString& name) { m_data = new wxVariantDataStringList(val); m_name = name; } +#endif + wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants { m_data = new wxVariantDataList(val); m_name = name; } +wxVariant::wxVariant( void* val, const wxString& name) +{ + m_data = new wxVariantDataVoidPtr(val); + m_name = name; +} + +wxVariant::wxVariant( wxObject* val, const wxString& name) +{ + m_data = new wxVariantDataWxObjectPtr(val); + m_name = name; +} + +#if wxUSE_DATETIME +wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date +{ + m_data = new wxVariantDataDateTime(val); + m_name = name; +} +#endif // wxUSE_DATETIME + #if wxUSE_ODBC wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date { @@ -1270,9 +1391,9 @@ bool wxVariant::operator== (double value) const { double thisValue; if (!Convert(&thisValue)) - return FALSE; - else - return (value == thisValue); + return false; + + return wxIsSameDouble(value, thisValue); } bool wxVariant::operator!= (double value) const @@ -1298,7 +1419,7 @@ bool wxVariant::operator== (long value) const { long thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1326,7 +1447,7 @@ bool wxVariant::operator== (char value) const { char thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1355,7 +1476,7 @@ bool wxVariant::operator== (bool value) const { bool thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1384,7 +1505,7 @@ bool wxVariant::operator== (const wxString& value) const { wxString thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; return value == thisValue; } @@ -1422,6 +1543,8 @@ void wxVariant::operator= (const wxChar* value) } } +#if WXWIN_COMPATIBILITY_2_4 + bool wxVariant::operator== (const wxStringList& value) const { wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); @@ -1432,7 +1555,10 @@ bool wxVariant::operator== (const wxStringList& value) const bool wxVariant::operator!= (const wxStringList& value) const { - return (!((*this) == value)); + wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); + + wxVariantDataStringList other(value); + return !(m_data->Eq(other)); } void wxVariant::operator= (const wxStringList& value) @@ -1449,6 +1575,8 @@ void wxVariant::operator= (const wxStringList& value) } } +#endif + bool wxVariant::operator== (const wxList& value) const { wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); @@ -1505,7 +1633,7 @@ bool wxVariant::operator== (const wxDateTime& value) const { wxDateTime thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; return value.IsEqualTo(thisValue); } @@ -1560,7 +1688,7 @@ bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const { wxFAIL_MSG( _T("TODO") ); - return FALSE; + return false; } bool wxVariant::operator!=(const wxArrayString& value) const @@ -1593,7 +1721,11 @@ wxArrayString wxVariant::GetArrayString() const // Treat a list variant as an array wxVariant wxVariant::operator[] (size_t idx) const { +#if WXWIN_COMPATIBILITY_2_4 wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") ); +#else + wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") ); +#endif if (GetType() == wxT("list")) { @@ -1601,14 +1733,17 @@ wxVariant wxVariant::operator[] (size_t idx) const wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); } +#if WXWIN_COMPATIBILITY_2_4 else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); - wxVariant variant( wxString( (wxChar*) (data->GetValue().Item(idx)->GetData()) )); + wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) ); + wxVariant variant( str ); return variant; } +#endif return wxNullVariant; } @@ -1628,18 +1763,24 @@ wxVariant& wxVariant::operator[] (size_t idx) // Return the number of elements in a list int wxVariant::GetCount() const { +#if WXWIN_COMPATIBILITY_2_4 wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") ); +#else + wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") ); +#endif if (GetType() == wxT("list")) { wxVariantDataList* data = (wxVariantDataList*) m_data; return data->GetValue().GetCount(); } +#if WXWIN_COMPATIBILITY_2_4 else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; return data->GetValue().GetCount(); } +#endif return 0; } @@ -1651,7 +1792,7 @@ wxString wxVariant::MakeString() const if (GetData()->Write(str)) return str; } - return wxString(wxT("")); + return wxEmptyString; } // Accessors @@ -1664,7 +1805,7 @@ void wxVariant::SetData(wxVariantData* data) // Returns a string representing the type of the variant, -// e.g. "string", "bool", "stringlist", "list", "double", "long" +// e.g. "string", "bool", "list", "double", "long" wxString wxVariant::GetType() const { if (IsNull()) @@ -1679,6 +1820,12 @@ bool wxVariant::IsType(const wxString& type) const return (GetType() == type); } +bool wxVariant::IsValueKindOf(const wxClassInfo* type) const +{ + wxClassInfo* info=m_data->GetValueClassInfo(); + return info ? info->IsKindOf(type) : false ; +} + // Value accessors double wxVariant::GetReal() const @@ -1747,6 +1894,12 @@ void* wxVariant::GetVoidPtr() const return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); } +wxObject* wxVariant::GetWxObjectPtr() +{ + wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr)); + return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); +} + #if wxUSE_DATETIME wxDateTime wxVariant::GetDateTime() const { @@ -1767,6 +1920,8 @@ wxList& wxVariant::GetList() const return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); } +#if WXWIN_COMPATIBILITY_2_4 + wxStringList& wxVariant::GetStringList() const { wxASSERT( (GetType() == wxT("stringlist")) ); @@ -1774,11 +1929,13 @@ wxStringList& wxVariant::GetStringList() const return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); } +#endif + // Make empty list void wxVariant::NullList() { SetData(new wxVariantDataList()); -}; +} // Append to list void wxVariant::Append(const wxVariant& value) @@ -1796,20 +1953,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.GetFirst(); + wxList::compatibility_iterator node = list.GetFirst(); while (node) { wxVariant* other = (wxVariant*) node->GetData(); if (value == *other) - return TRUE; + return true; node = node->GetNext(); } - return FALSE; + return false; } // Deletes the nth element of the list @@ -1818,11 +1975,11 @@ bool wxVariant::Delete(int item) wxList& list = GetList(); wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") ); - wxNode* node = list.Item(item); + wxList::compatibility_iterator node = list.Item(item); wxVariant* variant = (wxVariant*) node->GetData(); delete variant; - delete node; - return TRUE; + list.Erase(node); + return true; } // Clear list @@ -1834,7 +1991,7 @@ void wxVariant::ClearList() } else { - if (GetType() != wxT("list")) + if (!GetType().IsSameAs(wxT("list"))) { delete m_data; m_data = NULL; @@ -1858,9 +2015,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 @@ -1878,17 +2035,17 @@ bool wxVariant::Convert(bool* value) const { wxString val(((wxVariantDataString*)GetData())->GetValue()); val.MakeLower(); - if (val == wxT("TRUE") || val == wxT("yes")) - *value = TRUE; - else if (val == wxT("FALSE") || val == wxT("no")) - *value = FALSE; + if (val == wxT("true") || val == wxT("yes") || val == wxT('1') ) + *value = true; + else if (val == wxT("false") || val == wxT("no") || val == wxT('0') ) + *value = false; else - return FALSE; + return false; } else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(double* value) const @@ -1905,9 +2062,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 @@ -1922,15 +2079,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; } #if wxUSE_DATETIME @@ -1940,11 +2097,12 @@ bool wxVariant::Convert(wxDateTime* value) const if (type == wxT("datetime")) { *value = ((wxVariantDataDateTime*)GetData())->GetValue(); - return TRUE; + return true; } // Fallback to string conversion wxString val; - return Convert(&val) && (value->ParseDate(val)); + return Convert(&val) && + (value->ParseDateTime(val) || value->ParseDate(val)); } #endif // wxUSE_DATETIME