X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52e812428f8d5b4e354482449aeb192f22ce50fd..c437b3f4e47b74715a2f2385d4862972babd7802:/src/common/variant.cpp?ds=sidebyside diff --git a/src/common/variant.cpp b/src/common/variant.cpp index bbfd8f4688..661a6190e5 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: variant.cpp +// Name: src/common/variant.cpp // Purpose: wxVariant class, container for any type // Author: Julian Smart // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "variant.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -20,6 +16,19 @@ #pragma hdrstop #endif +#include "wx/variant.h" + +#if wxUSE_VARIANT + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/math.h" + #include "wx/crt.h" + #if wxUSE_STREAMS + #include "wx/stream.h" + #endif +#endif + #if wxUSE_STD_IOSTREAM #if wxUSE_IOSTREAMH #include @@ -34,285 +43,196 @@ using namespace std ; #endif #if wxUSE_STREAMS -#include "wx/stream.h" -#include "wx/txtstrm.h" + #include "wx/txtstrm.h" #endif #include "wx/string.h" #include "wx/tokenzr.h" -#include "wx/variant.h" +wxVariant WXDLLIMPEXP_BASE wxNullVariant; -IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject) -wxVariant WXDLLIMPEXP_BASE wxNullVariant; +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxVariantList) /* - * wxVariantDataList + * wxVariant */ -class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData -{ -DECLARE_DYNAMIC_CLASS(wxVariantDataList) -public: - wxVariantDataList() {} - wxVariantDataList(const wxList& list); - ~wxVariantDataList(); - - wxList& GetValue() const { return (wxList&) m_value; } - void SetValue(const wxList& 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("list"); }; - - void Clear(); - -protected: - wxList m_value; -}; - -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData) +IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject) -wxVariantDataList::wxVariantDataList(const wxList& list) +wxVariant::wxVariant() { - SetValue(list); + m_data = NULL; } -wxVariantDataList::~wxVariantDataList() +bool wxVariant::IsNull() const { - Clear(); + return (m_data == NULL); } -void wxVariantDataList::SetValue(const wxList& value) +void wxVariant::MakeNull() { - Clear(); - wxList::compatibility_iterator node = value.GetFirst(); - while (node) - { - wxVariant* var = (wxVariant*) node->GetData(); - m_value.Append(new wxVariant(*var)); - node = node->GetNext(); - } + UnRef(); } -void wxVariantDataList::Clear() +void wxVariant::Clear() { - wxList::compatibility_iterator node = m_value.GetFirst(); - while (node) - { - wxVariant* var = (wxVariant*) node->GetData(); - delete var; - node = node->GetNext(); - } - m_value.Clear(); + m_name = wxEmptyString; } -void wxVariantDataList::Copy(wxVariantData& data) +wxVariant::wxVariant(const wxVariant& variant) + : wxObject() { - wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Copy: Can't copy to this type of data") ); - - wxVariantDataList& listData = (wxVariantDataList&) data; - - listData.Clear(); - wxList::compatibility_iterator node = m_value.GetFirst(); - while (node) - { - wxVariant* var = (wxVariant*) node->GetData(); - listData.m_value.Append(new wxVariant(*var)); - node = node->GetNext(); - } -} + m_data = NULL; -bool wxVariantDataList::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") ); + if (!variant.IsNull()) + Ref(variant); - wxVariantDataList& listData = (wxVariantDataList&) data; - 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; - node1 = node1->GetNext(); - node2 = node2->GetNext(); - } - if (node1 || node2) return false; - return true; + m_name = variant.m_name; } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataList::Write(wxSTD ostream& str) const +wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data { - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; + m_data = data; + m_name = name; } -#endif -bool wxVariantDataList::Write(wxString& str) const +wxVariant::~wxVariant() { - str = wxEmptyString; - wxList::compatibility_iterator node = m_value.GetFirst(); - while (node) - { - wxVariant* var = (wxVariant*) node->GetData(); - if (node != m_value.GetFirst()) - str += wxT(" "); - wxString str1; - str += var->MakeString(); - node = node->GetNext(); - } - - return true; + UnRef(); } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) +// Assignment +void wxVariant::operator= (const wxVariant& variant) { - wxFAIL_MSG(wxT("Unimplemented")); - // TODO - return false; + Ref(variant); + m_name = variant.m_name; } -#endif -bool wxVariantDataList::Read(wxString& WXUNUSED(str)) +// myVariant = new wxStringVariantData("hello") +void wxVariant::operator= (wxVariantData* variantData) { - wxFAIL_MSG(wxT("Unimplemented")); - // TODO - return false; + UnRef(); + m_data = variantData; } -#if WXWIN_COMPATIBILITY_2_4 - -/* - * wxVariantDataStringList - */ -class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData +bool wxVariant::operator== (const wxVariant& variant) const { -DECLARE_DYNAMIC_CLASS(wxVariantDataStringList) -public: - wxVariantDataStringList() {} - wxVariantDataStringList(const wxStringList& list) { m_value = list; } - - wxStringList& GetValue() const { return (wxStringList&) m_value; } - void SetValue(const wxStringList& 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("stringlist"); }; + if (IsNull() || variant.IsNull()) + return (IsNull() == variant.IsNull()); -protected: - wxStringList m_value; -}; + if (GetType() != variant.GetType()) + return false; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataStringList, wxVariantData) + return (GetData()->Eq(* variant.GetData())); +} -void wxVariantDataStringList::SetValue(const wxStringList& value) +bool wxVariant::operator!= (const wxVariant& variant) const { - m_value = value; + return (!(*this == variant)); } -void wxVariantDataStringList::Copy(wxVariantData& data) +wxString wxVariant::MakeString() const { - wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Copy: Can't copy to this type of data") ); - - wxVariantDataStringList& listData = (wxVariantDataStringList&) data; + if (!IsNull()) + { + wxString str; + if (GetData()->Write(str)) + return str; + } + return wxEmptyString; +} - listData.m_value = m_value ; +void wxVariant::SetData(wxVariantData* data) +{ + UnRef(); + m_data = data; } -bool wxVariantDataStringList::Eq(wxVariantData& data) const +void wxVariant::Ref(const wxVariant& clone) { - wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") ); + // nothing to be done + if (m_data == clone.m_data) + return; - wxVariantDataStringList& listData = (wxVariantDataStringList&) data; - wxStringList::compatibility_iterator node1 = m_value.GetFirst(); - wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst(); - while (node1 && node2) + // delete reference to old data + UnRef(); + + // reference new data + if ( clone.m_data ) { - wxString str1 ( node1->GetData() ); - wxString str2 ( node2->GetData() ); - if (str1 != str2) - return false; - node1 = node1->GetNext(); - node2 = node2->GetNext(); + m_data = clone.m_data; + m_data->m_count++; } - if (node1 || node2) return false; - return true; } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataStringList::Write(wxSTD ostream& str) const + +void wxVariant::UnRef() { - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; + if ( m_data ) + { + wxASSERT_MSG( m_data->m_count > 0, _T("invalid ref data count") ); + + m_data->DecRef(); + m_data = NULL; + } } -#endif -bool wxVariantDataStringList::Write(wxString& str) const +bool wxVariant::Unshare() { - str.Empty(); - wxStringList::compatibility_iterator node = m_value.GetFirst(); - while (node) + if ( m_data && m_data->GetRefCount() > 1 ) { - const wxChar* s = node->GetData(); - if (node != m_value.GetFirst()) - str += wxT(" "); - str += s; - node = node->GetNext(); + // note that ref is not going to be destroyed in this case... + const wxVariantData* ref = m_data; + UnRef(); + + // ... so we can still access it + m_data = ref->Clone(); + + wxASSERT_MSG( (m_data && m_data->GetRefCount() == 1), + _T("wxVariant::AllocExclusive() failed.") ); + + if (!m_data || m_data->GetRefCount() != 1) + return false; + else + return true; } + //else: data is null or ref count is 1, so we are exclusive owners of m_refData anyhow + else + return true; +} - return true; + +// Returns a string representing the type of the variant, +// e.g. "string", "bool", "list", "double", "long" +wxString wxVariant::GetType() const +{ + if (IsNull()) + return wxString(wxT("null")); + else + return GetData()->GetType(); } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str)) + +bool wxVariant::IsType(const wxString& type) const { - wxFAIL_MSG(wxT("Unimplemented")); - // TODO - return false; + return (GetType() == type); } -#endif -bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) +bool wxVariant::IsValueKindOf(const wxClassInfo* type) const { - wxFAIL_MSG(wxT("Unimplemented")); - // TODO - return false; + wxClassInfo* info=GetData()->GetValueClassInfo(); + return info ? info->IsKindOf(type) : false ; } -#endif //2.4 compat -/* - * wxVariantDataLong - */ +// ----------------------------------------------------------------- +// wxVariantDataLong +// ----------------------------------------------------------------- class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataLong) public: wxVariantDataLong() { m_value = 0; } wxVariantDataLong(long value) { m_value = value; } @@ -320,7 +240,6 @@ public: inline long GetValue() const { return m_value; } inline void SetValue(long value) { m_value = value; } - virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; virtual bool Read(wxString& str); @@ -334,23 +253,14 @@ public: virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("long"); }; + wxVariantData* Clone() const { return new wxVariantDataLong(m_value); } + + virtual wxString GetType() const { return wxT("long"); } protected: long m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData) - -void wxVariantDataLong::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Copy: Can't copy to this type of data") ); - - wxVariantDataLong& otherData = (wxVariantDataLong&) data; - - otherData.m_value = m_value; -} - bool wxVariantDataLong::Eq(wxVariantData& data) const { wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") ); @@ -403,66 +313,114 @@ bool wxVariantDataLong::Read(wxInputStream& str) bool wxVariantDataLong::Read(wxString& str) { - m_value = wxAtol((const wxChar*) str); + m_value = wxAtol(str); return true; } -/* - * wxVariantDataReal - */ +// wxVariant -class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData +wxVariant::wxVariant(long val, const wxString& name) { -DECLARE_DYNAMIC_CLASS(wxVariantDataReal) -public: - wxVariantDataReal() { m_value = 0.0; } - wxVariantDataReal(double value) { m_value = value; } - - inline double GetValue() const { return m_value; } - inline void SetValue(double value) { m_value = value; } - - virtual void Copy(wxVariantData& data); - virtual bool Eq(wxVariantData& data) const; - virtual bool Read(wxString& str); -#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 -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream &str) const; -#endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("double"); }; - -protected: - double m_value; -}; - -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData) + m_data = new wxVariantDataLong(val); + m_name = name; +} -void wxVariantDataReal::Copy(wxVariantData& data) +wxVariant::wxVariant(int val, const wxString& name) { - wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Copy: Can't copy to this type of data") ); - - wxVariantDataReal& otherData = (wxVariantDataReal&) data; - - otherData.m_value = m_value; + m_data = new wxVariantDataLong((long)val); + m_name = name; } -bool wxVariantDataReal::Eq(wxVariantData& data) const +wxVariant::wxVariant(short val, const wxString& name) { - wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Eq: argument mismatch") ); - - wxVariantDataReal& otherData = (wxVariantDataReal&) data; - - return (otherData.m_value == m_value); + m_data = new wxVariantDataLong((long)val); + m_name = name; } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataReal::Write(wxSTD ostream& str) const +bool wxVariant::operator== (long value) const +{ + long thisValue; + if (!Convert(&thisValue)) + return false; + else + return (value == thisValue); +} + +bool wxVariant::operator!= (long value) const +{ + return (!((*this) == value)); +} + +void wxVariant::operator= (long value) +{ + if (GetType() == wxT("long") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataLong*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataLong(value); + } +} + +long wxVariant::GetLong() const +{ + long value; + if (Convert(& value)) + return value; + else + { + wxFAIL_MSG(wxT("Could not convert to a long")); + return 0; + } +} + +// ----------------------------------------------------------------- +// wxVariantDoubleData +// ----------------------------------------------------------------- + +class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData +{ +public: + wxVariantDoubleData() { m_value = 0.0; } + wxVariantDoubleData(double value) { m_value = value; } + + inline double GetValue() const { return m_value; } + inline void SetValue(double value) { m_value = value; } + + virtual bool Eq(wxVariantData& data) const; + virtual bool Read(wxString& str); +#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 +#if wxUSE_STREAMS + virtual bool Read(wxInputStream& str); + virtual bool Write(wxOutputStream &str) const; +#endif // wxUSE_STREAMS + virtual wxString GetType() const { return wxT("double"); } + + wxVariantData* Clone() const { return new wxVariantDoubleData(m_value); } +protected: + double m_value; +}; + +bool wxVariantDoubleData::Eq(wxVariantData& data) const +{ + wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") ); + + wxVariantDoubleData& otherData = (wxVariantDoubleData&) data; + + return wxIsSameDouble(otherData.m_value, m_value); +} + +#if wxUSE_STD_IOSTREAM +bool wxVariantDoubleData::Write(wxSTD ostream& str) const { wxString s; Write(s); @@ -471,14 +429,14 @@ bool wxVariantDataReal::Write(wxSTD ostream& str) const } #endif -bool wxVariantDataReal::Write(wxString& str) const +bool wxVariantDoubleData::Write(wxString& str) const { - str.Printf(wxT("%.4f"), m_value); + str.Printf(wxT("%.14g"), m_value); return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataReal::Read(wxSTD istream& str) +bool wxVariantDoubleData::Read(wxSTD istream& str) { str >> m_value; return true; @@ -486,14 +444,14 @@ bool wxVariantDataReal::Read(wxSTD istream& str) #endif #if wxUSE_STREAMS -bool wxVariantDataReal::Write(wxOutputStream& str) const +bool wxVariantDoubleData::Write(wxOutputStream& str) const { wxTextOutputStream s(str); s.WriteDouble((double)m_value); return true; } -bool wxVariantDataReal::Read(wxInputStream& str) +bool wxVariantDoubleData::Read(wxInputStream& str) { wxTextInputStream s(str); m_value = (float)s.ReadDouble(); @@ -501,20 +459,66 @@ bool wxVariantDataReal::Read(wxInputStream& str) } #endif // wxUSE_STREAMS -bool wxVariantDataReal::Read(wxString& str) +bool wxVariantDoubleData::Read(wxString& str) { - m_value = wxAtof((const wxChar*) str); + m_value = wxAtof(str); return true; } -#ifdef HAVE_BOOL -/* - * wxVariantDataBool - */ +// wxVariant double code + +wxVariant::wxVariant(double val, const wxString& name) +{ + m_data = new wxVariantDoubleData(val); + m_name = name; +} + +bool wxVariant::operator== (double value) const +{ + double thisValue; + if (!Convert(&thisValue)) + return false; + + return wxIsSameDouble(value, thisValue); +} + +bool wxVariant::operator!= (double value) const +{ + return (!((*this) == value)); +} + +void wxVariant::operator= (double value) +{ + if (GetType() == wxT("double") && + m_data->GetRefCount() == 1) + { + ((wxVariantDoubleData*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDoubleData(value); + } +} + +double wxVariant::GetDouble() const +{ + double value; + if (Convert(& value)) + return value; + else + { + wxFAIL_MSG(wxT("Could not convert to a double number")); + return 0.0; + } +} + +// ----------------------------------------------------------------- +// wxVariantBoolData +// ----------------------------------------------------------------- class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataBool) public: wxVariantDataBool() { m_value = 0; } wxVariantDataBool(bool value) { m_value = value; } @@ -522,7 +526,6 @@ public: inline bool GetValue() const { return m_value; } inline void SetValue(bool 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; @@ -536,23 +539,13 @@ public: virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("bool"); }; + virtual wxString GetType() const { return wxT("bool"); } + wxVariantData* Clone() const { return new wxVariantDataBool(m_value); } protected: bool m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData) - -void wxVariantDataBool::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Copy: Can't copy to this type of data") ); - - wxVariantDataBool& otherData = (wxVariantDataBool&) data; - - otherData.m_value = m_value; -} - bool wxVariantDataBool::Eq(wxVariantData& data) const { wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") ); @@ -607,26 +600,71 @@ bool wxVariantDataBool::Read(wxInputStream& str) bool wxVariantDataBool::Read(wxString& str) { - m_value = (wxAtol((const wxChar*) str) != 0); + m_value = (wxAtol(str) != 0); return true; } -#endif // HAVE_BOOL -/* - * wxVariantDataChar - */ +// wxVariant **** + +wxVariant::wxVariant(bool val, const wxString& name) +{ + m_data = new wxVariantDataBool(val); + m_name = name; +} + +bool wxVariant::operator== (bool value) const +{ + bool thisValue; + if (!Convert(&thisValue)) + return false; + else + return (value == thisValue); +} + +bool wxVariant::operator!= (bool value) const +{ + return (!((*this) == value)); +} + +void wxVariant::operator= (bool value) +{ + if (GetType() == wxT("bool") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataBool*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataBool(value); + } +} + +bool wxVariant::GetBool() const +{ + bool value; + if (Convert(& value)) + return value; + else + { + wxFAIL_MSG(wxT("Could not convert to a bool")); + return 0; + } +} + +// ----------------------------------------------------------------- +// wxVariantDataChar +// ----------------------------------------------------------------- class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataChar) public: wxVariantDataChar() { m_value = 0; } - wxVariantDataChar(char value) { m_value = value; } + wxVariantDataChar(const wxUniChar& value) { m_value = value; } - inline char GetValue() const { return m_value; } - inline void SetValue(char value) { m_value = value; } + inline wxUniChar GetValue() const { return m_value; } + inline void SetValue(const wxUniChar& value) { m_value = value; } - virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; #if wxUSE_STD_IOSTREAM virtual bool Read(wxSTD istream& str); @@ -638,23 +676,13 @@ public: virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("char"); }; + virtual wxString GetType() const { return wxT("char"); } + wxVariantData* Clone() const { return new wxVariantDataChar(m_value); } protected: - char m_value; + wxUniChar m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData) - -void wxVariantDataChar::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Copy: Can't copy to this type of data") ); - - wxVariantDataChar& otherData = (wxVariantDataChar&) data; - - otherData.m_value = m_value; -} - bool wxVariantDataChar::Eq(wxVariantData& data) const { wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") ); @@ -667,16 +695,14 @@ bool wxVariantDataChar::Eq(wxVariantData& data) const #if wxUSE_STD_IOSTREAM bool wxVariantDataChar::Write(wxSTD ostream& str) const { - wxString s; - Write(s); - str << (const char*) s.mb_str(); + str << wxString(m_value); return true; } #endif bool wxVariantDataChar::Write(wxString& str) const { - str.Printf(wxT("%c"), m_value); + str = m_value; return true; } @@ -684,7 +710,7 @@ bool wxVariantDataChar::Write(wxString& str) const bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); -// str >> m_value; + return false; } #endif @@ -694,7 +720,10 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const { wxTextOutputStream s(str); - s.Write8(m_value); + // FIXME-UTF8: this should be just "s << m_value;" after removal of + // ANSI build and addition of wxUniChar to wxTextOutputStream: + s << (wxChar)m_value; + return true; } @@ -702,24 +731,83 @@ bool wxVariantDataChar::Read(wxInputStream& str) { wxTextInputStream s(str); - m_value = s.Read8(); + // FIXME-UTF8: this should be just "s >> m_value;" after removal of + // ANSI build and addition of wxUniChar to wxTextInputStream: + wxChar ch; + s >> ch; + m_value = ch; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataChar::Read(wxString& str) { - m_value = str.ToAscii()[0u]; + m_value = str[0u]; return true; } -/* - * wxVariantDataString - */ +wxVariant::wxVariant(const wxUniChar& val, const wxString& name) +{ + m_data = new wxVariantDataChar(val); + m_name = name; +} + +wxVariant::wxVariant(char val, const wxString& name) +{ + m_data = new wxVariantDataChar(val); + m_name = name; +} + +wxVariant::wxVariant(wchar_t val, const wxString& name) +{ + m_data = new wxVariantDataChar(val); + m_name = name; +} + +bool wxVariant::operator==(const wxUniChar& value) const +{ + wxUniChar thisValue; + if (!Convert(&thisValue)) + return false; + else + return (value == thisValue); +} + +wxVariant& wxVariant::operator=(const wxUniChar& value) +{ + if (GetType() == wxT("char") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataChar*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataChar(value); + } + + return *this; +} + +wxUniChar wxVariant::GetChar() const +{ + wxUniChar value; + if (Convert(& value)) + return value; + else + { + wxFAIL_MSG(wxT("Could not convert to a char")); + return wxUniChar(0); + } +} + +// ---------------------------------------------------------------------------- +// wxVariantDataString +// ---------------------------------------------------------------------------- class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataString) public: wxVariantDataString() { } wxVariantDataString(const wxString& value) { m_value = value; } @@ -727,7 +815,6 @@ public: inline wxString GetValue() const { return m_value; } inline void SetValue(const wxString& 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; @@ -735,27 +822,19 @@ public: virtual bool Read(wxString& str); virtual bool Write(wxString& str) const; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str); + virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; } #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("string"); }; + virtual wxString GetType() const { return wxT("string"); } + wxVariantData* Clone() const { return new wxVariantDataString(m_value); } protected: wxString m_value; }; -void wxVariantDataString::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Copy: Can't copy to this type of data") ); - - wxVariantDataString& otherData = (wxVariantDataString&) data; - - otherData.m_value = m_value; -} - bool wxVariantDataString::Eq(wxVariantData& data) const { wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") ); @@ -779,14 +858,6 @@ bool wxVariantDataString::Write(wxString& str) const return true; } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataString::Read(wxSTD istream& str) -{ - str >> m_value; - return true; -} -#endif - #if wxUSE_STREAMS bool wxVariantDataString::Write(wxOutputStream& str) const { @@ -800,7 +871,7 @@ bool wxVariantDataString::Read(wxInputStream& str) { wxTextInputStream s(str); - m_value = s.ReadString(); + m_value = s.ReadLine(); return true; } #endif // wxUSE_STREAMS @@ -811,98 +882,90 @@ bool wxVariantDataString::Read(wxString& str) return true; } -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) +// wxVariant **** -/* - * wxVariantDataVoidPtr - */ +wxVariant::wxVariant(const wxString& val, const wxString& name) +{ + m_data = new wxVariantDataString(val); + m_name = name; +} -class wxVariantDataVoidPtr: public wxVariantData +wxVariant::wxVariant(const char* val, const wxString& name) { -DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr) -public: - wxVariantDataVoidPtr() { } - wxVariantDataVoidPtr(void* value) { m_value = value; } + m_data = new wxVariantDataString(wxString(val)); + m_name = name; +} - inline void* GetValue() const { return m_value; } - inline void SetValue(void* value) { m_value = value; } +wxVariant::wxVariant(const wchar_t* val, const wxString& name) +{ + m_data = new wxVariantDataString(wxString(val)); + m_name = name; +} - 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("void*"); }; - virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } - -protected: - void* m_value; - - DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr) -}; - -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData) - -void wxVariantDataVoidPtr::Copy(wxVariantData& data) +wxVariant::wxVariant(const wxCStrData& val, const wxString& name) { - wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") ); - - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; - - otherData.m_value = m_value; + m_data = new wxVariantDataString(val.AsString()); + m_name = name; } -bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const +wxVariant::wxVariant(const wxScopedCharBuffer& val, const wxString& name) { - wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") ); - - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; + m_data = new wxVariantDataString(wxString(val)); + m_name = name; +} - return (otherData.m_value == m_value); +wxVariant::wxVariant(const wxScopedWCharBuffer& val, const wxString& name) +{ + m_data = new wxVariantDataString(wxString(val)); + m_name = name; } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const +bool wxVariant::operator== (const wxString& value) const { - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; + wxString thisValue; + if (!Convert(&thisValue)) + return false; + + return value == thisValue; } -#endif -bool wxVariantDataVoidPtr::Write(wxString& str) const +bool wxVariant::operator!= (const wxString& value) const { - str.Printf(wxT("%ld"), (long) m_value); - return true; + return (!((*this) == value)); } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) +wxVariant& wxVariant::operator= (const wxString& value) { - // Not implemented - return false; + if (GetType() == wxT("string") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataString*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataString(value); + } + return *this; } -#endif -bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) +wxString wxVariant::GetString() const { - // Not implemented - return false; + wxString value; + if (!Convert(& value)) + { + wxFAIL_MSG(wxT("Could not convert to a string")); + } + + return value; } -/* - * wxVariantDataWxObjectPtr - */ +// ---------------------------------------------------------------------------- +// wxVariantDataWxObjectPtr +// ---------------------------------------------------------------------------- class wxVariantDataWxObjectPtr: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr) public: wxVariantDataWxObjectPtr() { } wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; } @@ -910,7 +973,6 @@ public: 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; @@ -921,31 +983,17 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const ; - virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; } + virtual wxVariantData* Clone() const { return new wxVariantDataWxObjectPtr(m_value); } + + virtual wxClassInfo* GetValueClassInfo(); - 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") ); + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") ); wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data; @@ -954,10 +1002,14 @@ bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const wxString wxVariantDataWxObjectPtr::GetType() const { - wxString returnVal(wxT("wxObject")); - if (m_value) { + wxString returnVal(wxT("wxObject*")); + + if (m_value) + { returnVal = m_value->GetClassInfo()->GetClassName(); + returnVal += wxT("*"); } + return returnVal; } @@ -982,7 +1034,7 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const bool wxVariantDataWxObjectPtr::Write(wxString& str) const { - str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value); + str.Printf(wxT("%s(%p)"), GetType().c_str(), static_cast(m_value)); return true; } @@ -1000,34 +1052,48 @@ bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str)) return false; } +// wxVariant -/* - * wxVariantDataDateTime - */ +wxVariant::wxVariant( wxObject* val, const wxString& name) +{ + m_data = new wxVariantDataWxObjectPtr(val); + m_name = name; +} -#if wxUSE_DATETIME +bool wxVariant::operator== (wxObject* value) const +{ + return (value == ((wxVariantDataWxObjectPtr*)GetData())->GetValue()); +} -class wxVariantDataDateTime: public wxVariantData +bool wxVariant::operator!= (wxObject* value) const { - DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime) + return (!((*this) == (wxObject*) value)); +} + +void wxVariant::operator= (wxObject* value) +{ + UnRef(); + m_data = new wxVariantDataWxObjectPtr(value); +} + +wxObject* wxVariant::GetWxObjectPtr() const +{ + return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); +} +// ---------------------------------------------------------------------------- +// wxVariantDataVoidPtr +// ---------------------------------------------------------------------------- + +class wxVariantDataVoidPtr: public wxVariantData +{ public: - wxVariantDataDateTime() { } - wxVariantDataDateTime(const wxDateTime& value) { m_value = value; } -#if wxUSE_ODBC - wxVariantDataDateTime(const TIME_STRUCT* valptr) - { m_value = wxDateTime(valptr->hour, valptr->minute, valptr->second); } - wxVariantDataDateTime(const DATE_STRUCT* valptr) - { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); } - wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr) - { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year, - valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); } -#endif //ODBC + wxVariantDataVoidPtr() { } + wxVariantDataVoidPtr(void* value) { m_value = value; } - inline wxDateTime GetValue() const { return m_value; } - inline void SetValue(const wxDateTime& value) { m_value = value; } + inline void* GetValue() const { return m_value; } + inline void SetValue(void* 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; @@ -1037,84 +1103,109 @@ public: virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return wxT("datetime"); }; - virtual wxVariantData* Clone() { return new wxVariantDataDateTime; } + virtual wxString GetType() const { return wxT("void*"); } + virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); } protected: - wxDateTime m_value; + void* m_value; }; - -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData) - -void wxVariantDataDateTime::Copy(wxVariantData& data) +bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const { - wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Copy: Can't copy to this type of data") ); + wxASSERT_MSG( data.GetType() == wxT("void*"), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") ); - wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data; + wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; - otherData.m_value = m_value; + return (otherData.m_value == m_value); } - -bool wxVariantDataDateTime::Eq(wxVariantData& data) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const { - wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") ); - - wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data; - - return (otherData.m_value == m_value); + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; } +#endif +bool wxVariantDataVoidPtr::Write(wxString& str) const +{ + str.Printf(wxT("%p"), m_value); + return true; +} #if wxUSE_STD_IOSTREAM -bool wxVariantDataDateTime::Write(wxSTD ostream& str) const +bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented return false; } #endif - -bool wxVariantDataDateTime::Write(wxString& str) const +bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) { - str = m_value.Format(); - return true; + // Not implemented + return false; } +// wxVariant -#if wxUSE_STD_IOSTREAM -bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) +wxVariant::wxVariant( void* val, const wxString& name) { - // Not implemented - return false; + m_data = new wxVariantDataVoidPtr(val); + m_name = name; +} + +bool wxVariant::operator== (void* value) const +{ + return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); } -#endif +bool wxVariant::operator!= (void* value) const +{ + return (!((*this) == (void*) value)); +} -bool wxVariantDataDateTime::Read(wxString& str) +void wxVariant::operator= (void* value) { - if(! m_value.ParseDateTime(str)) - return false; - return true; + if (GetType() == wxT("void*") && (m_data->GetRefCount() == 1)) + { + ((wxVariantDataVoidPtr*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataVoidPtr(value); + } } -#endif // wxUSE_DATETIME +void* wxVariant::GetVoidPtr() const +{ + // handling this specially is convenient when working with COM, see #9873 + if ( IsNull() ) + return NULL; + + wxASSERT( GetType() == wxT("void*") ); + + return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); +} // ---------------------------------------------------------------------------- -// wxVariantDataArrayString +// wxVariantDataDateTime // ---------------------------------------------------------------------------- -class wxVariantDataArrayString: public wxVariantData +#if wxUSE_DATETIME + +class wxVariantDataDateTime: public wxVariantData { public: - wxVariantDataArrayString() { } - wxVariantDataArrayString(const wxArrayString& value) { m_value = value; } + wxVariantDataDateTime() { } + wxVariantDataDateTime(const wxDateTime& value) { m_value = value; } - wxArrayString GetValue() const { return m_value; } - void SetValue(const wxArrayString& value) { m_value = value; } + inline wxDateTime GetValue() const { return m_value; } + inline void SetValue(const wxDateTime& value) { m_value = value; } - virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; #if wxUSE_STD_IOSTREAM virtual bool Write(wxSTD ostream& str) const; @@ -1124,63 +1215,47 @@ public: 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; } + virtual wxString GetType() const { return wxT("datetime"); } + virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); } protected: - wxArrayString m_value; - - DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString) + wxDateTime m_value; }; -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 +bool wxVariantDataDateTime::Eq(wxVariantData& data) const { - wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") ); + wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") ); - wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; + wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data; - return otherData.m_value == m_value; + return (otherData.m_value == m_value); } #if wxUSE_STD_IOSTREAM -bool wxVariantDataArrayString::Write(wxSTD ostream& str) const +bool wxVariantDataDateTime::Write(wxSTD ostream& str) const { - // Not implemented - return false; + wxString value; + Write( value ); + str << value.c_str(); + return true; } #endif -bool wxVariantDataArrayString::Write(wxString& str) const +bool wxVariantDataDateTime::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]; - } - + if ( m_value.IsValid() ) + str = m_value.Format(); + else + str = wxS("Invalid"); return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) +bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented return false; @@ -1188,762 +1263,371 @@ bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) #endif -bool wxVariantDataArrayString::Read(wxString& str) +bool wxVariantDataDateTime::Read(wxString& str) { - wxStringTokenizer tk(str, _T(";")); - while ( tk.HasMoreTokens() ) + if ( str == wxS("Invalid") ) { - m_value.Add(tk.GetNextToken()); + m_value = wxInvalidDateTime; + return true; } - return true; + wxString::const_iterator end; + return m_value.ParseDateTime(str, &end) && end == str.end(); } +// wxVariant - -/* - * wxVariant - */ - -IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject) - -// Construction & destruction -wxVariant::wxVariant() +wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date { - m_data = (wxVariantData*) NULL; + m_data = new wxVariantDataDateTime(val); + m_name = name; } -wxVariant::wxVariant(double val, const wxString& name) +bool wxVariant::operator== (const wxDateTime& value) const { - m_data = new wxVariantDataReal(val); - m_name = name; -} - -wxVariant::wxVariant(long val, const wxString& name) -{ - m_data = new wxVariantDataLong(val); - 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) -{ - m_data = new wxVariantDataChar(val); - m_name = name; -} - -wxVariant::wxVariant(const wxString& val, const wxString& name) -{ - m_data = new wxVariantDataString(val); - m_name = name; -} - -wxVariant::wxVariant(const wxChar* val, const wxString& name) -{ - m_data = new wxVariantDataString(wxString(val)); - 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 -{ - m_data = new wxVariantDataDateTime(valptr); - m_name = name; -} - -wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date -{ - m_data = new wxVariantDataDateTime(valptr); - m_name = name; -} - -wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date -{ - m_data = new wxVariantDataDateTime(valptr); - m_name = name; -} -#endif // 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()) - { - m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject(); - variant.m_data->Copy(*m_data); - } - else - m_data = (wxVariantData*) NULL; - m_name = variant.m_name; -} - -wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data -{ - m_data = data; - m_name = name; -} - -wxVariant::~wxVariant() -{ - delete m_data; -} - - -// Make NULL (i.e. delete the data) -void wxVariant::MakeNull() -{ - delete m_data; - m_data = NULL; -} - -// Generic operators -// Assignment -void wxVariant::operator= (const wxVariant& variant) -{ - if (variant.IsNull()) - { - MakeNull(); - return; - } - - if (IsNull() || (GetType() != variant.GetType())) - { - if (m_data) - delete m_data; - m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject(); - } - - variant.GetData()->Copy(* GetData()); - - m_name = variant.m_name; -} - -// Assignment using data, e.g. -// myVariant = new wxStringVariantData("hello") -void wxVariant::operator= (wxVariantData* variantData) -{ - MakeNull(); - m_data = variantData; -} - -bool wxVariant::operator== (const wxVariant& variant) const -{ - if (IsNull() || variant.IsNull()) - return (IsNull() == variant.IsNull()); - - return (GetData()->Eq(* variant.GetData())); -} - -bool wxVariant::operator!= (const wxVariant& variant) const -{ - return (!(*this == variant)); -} - - -// Specific operators -bool wxVariant::operator== (double value) const -{ - double thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); -} - -bool wxVariant::operator!= (double value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (double value) -{ - if (GetType() == wxT("double")) - { - ((wxVariantDataReal*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataReal(value); - } -} - -bool wxVariant::operator== (long value) const -{ - long thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); -} - -bool wxVariant::operator!= (long value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (long value) -{ - if (GetType() == wxT("long")) - { - ((wxVariantDataLong*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataLong(value); - } -} - -bool wxVariant::operator== (char value) const -{ - char thisValue; + wxDateTime thisValue; if (!Convert(&thisValue)) return false; - else - return (value == thisValue); -} - -bool wxVariant::operator!= (char value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (char value) -{ - if (GetType() == wxT("char")) - { - ((wxVariantDataChar*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataChar(value); - } -} -#ifdef HAVE_BOOL -bool wxVariant::operator== (bool value) const -{ - bool thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); + return value.IsEqualTo(thisValue); } -bool wxVariant::operator!= (bool value) const +bool wxVariant::operator!= (const wxDateTime& value) const { return (!((*this) == value)); } -void wxVariant::operator= (bool value) +void wxVariant::operator= (const wxDateTime& value) { - if (GetType() == wxT("bool")) + if (GetType() == wxT("datetime") && + m_data->GetRefCount() == 1) { - ((wxVariantDataBool*)GetData())->SetValue(value); + ((wxVariantDataDateTime*)GetData())->SetValue(value); } else { - if (m_data) - delete m_data; - m_data = new wxVariantDataBool(value); + UnRef(); + m_data = new wxVariantDataDateTime(value); } } -#endif // HAVE_BOOL - -bool wxVariant::operator== (const wxString& value) const -{ - wxString thisValue; - if (!Convert(&thisValue)) - return false; - - return value == thisValue; -} - -bool wxVariant::operator!= (const wxString& value) const -{ - return (!((*this) == value)); -} -void wxVariant::operator= (const wxString& value) +wxDateTime wxVariant::GetDateTime() const { - if (GetType() == wxT("string")) - { - ((wxVariantDataString*)GetData())->SetValue(value); - } - else + wxDateTime value; + if (!Convert(& value)) { - if (m_data) - delete m_data; - m_data = new wxVariantDataString(value); + wxFAIL_MSG(wxT("Could not convert to a datetime")); } -} -void wxVariant::operator= (const wxChar* value) -{ - if (GetType() == wxT("string")) - { - ((wxVariantDataString*)GetData())->SetValue(wxString(value)); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataString(wxString(value)); - } + return value; } -#if WXWIN_COMPATIBILITY_2_4 - -bool wxVariant::operator== (const wxStringList& value) const -{ - wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); +#endif // wxUSE_DATETIME - wxVariantDataStringList other(value); - return (m_data->Eq(other)); -} +// ---------------------------------------------------------------------------- +// wxVariantDataArrayString +// ---------------------------------------------------------------------------- -bool wxVariant::operator!= (const wxStringList& value) const +class wxVariantDataArrayString: public wxVariantData { - wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); - - wxVariantDataStringList other(value); - return !(m_data->Eq(other)); -} +public: + wxVariantDataArrayString() { } + wxVariantDataArrayString(const wxArrayString& value) { m_value = value; } -void wxVariant::operator= (const wxStringList& value) -{ - if (GetType() == wxT("stringlist")) - { - ((wxVariantDataStringList*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataStringList(value); - } -} + wxArrayString GetValue() const { return m_value; } + void SetValue(const wxArrayString& value) { m_value = value; } + 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() const { return new wxVariantDataArrayString(m_value); } -bool wxVariant::operator== (const wxList& value) const -{ - wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); - - wxVariantDataList other(value); - return (m_data->Eq(other)); -} +protected: + wxArrayString m_value; +}; -bool wxVariant::operator!= (const wxList& value) const +bool wxVariantDataArrayString::Eq(wxVariantData& data) const { - return (!((*this) == value)); -} + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") ); -void wxVariant::operator= (const wxList& value) -{ - if (GetType() == wxT("list")) - { - ((wxVariantDataList*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataList(value); - } -} + wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; -bool wxVariant::operator== (void* value) const -{ - return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); + return otherData.m_value == m_value; } -bool wxVariant::operator!= (void* value) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(str)) const { - return (!((*this) == (void*) value)); + // Not implemented + return false; } +#endif -void wxVariant::operator= (void* value) +bool wxVariantDataArrayString::Write(wxString& str) const { - if (GetType() == wxT("void*")) - { - ((wxVariantDataVoidPtr*)GetData())->SetValue(value); - } - else + size_t count = m_value.GetCount(); + for ( size_t n = 0; n < count; n++ ) { - if (m_data) - delete m_data; - m_data = new wxVariantDataVoidPtr(value); - } -} - -#if wxUSE_DATETIME -bool wxVariant::operator== (const wxDateTime& value) const -{ - wxDateTime thisValue; - if (!Convert(&thisValue)) - return false; - - return value.IsEqualTo(thisValue); -} - -bool wxVariant::operator!= (const wxDateTime& value) const -{ - return (!((*this) == value)); -} + if ( n ) + str += _T(';'); -void wxVariant::operator= (const wxDateTime& value) -{ - if (GetType() == wxT("datetime")) - { - ((wxVariantDataDateTime*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); + str += m_value[n]; } -} -#endif // wxUSE_DATETIME - -#if wxUSE_ODBC -void wxVariant::operator= (const DATE_STRUCT* value) -{ - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); -} - -void wxVariant::operator= (const TIME_STRUCT* value) -{ - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); -} - - -void wxVariant::operator= (const TIMESTAMP_STRUCT* value) -{ - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); + return true; } -#endif // wxUSE_ODBC -bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) { - wxFAIL_MSG( _T("TODO") ); - + // Not implemented return false; } +#endif -bool wxVariant::operator!=(const wxArrayString& value) const -{ - return !(*this == value); -} -void wxVariant::operator=(const wxArrayString& value) +bool wxVariantDataArrayString::Read(wxString& str) { - if (GetType() == wxT("arrstring")) - { - ((wxVariantDataArrayString *)GetData())->SetValue(value); - } - else + wxStringTokenizer tk(str, _T(";")); + while ( tk.HasMoreTokens() ) { - delete m_data; - m_data = new wxVariantDataArrayString(value); + m_value.Add(tk.GetNextToken()); } -} - -wxArrayString wxVariant::GetArrayString() const -{ - if ( GetType() == wxT("arrstring") ) - return ((wxVariantDataArrayString *)GetData())->GetValue(); - return wxArrayString(); + return true; } +// wxVariant -// 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")) - { - wxVariantDataList* data = (wxVariantDataList*) m_data; - 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") ); - - wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) ); - wxVariant variant( str ); - return variant; - } -#endif - return wxNullVariant; +wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings +{ + m_data = new wxVariantDataArrayString(val); + m_name = name; } -wxVariant& wxVariant::operator[] (size_t idx) +bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const { - // 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() == wxT("list")), wxT("Invalid type for array operator") ); - - wxVariantDataList* data = (wxVariantDataList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); + wxFAIL_MSG( _T("TODO") ); - return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); + return false; } -// Return the number of elements in a list -int wxVariant::GetCount() const +bool wxVariant::operator!=(const wxArrayString& value) 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 + return !(*this == value); +} - if (GetType() == wxT("list")) +void wxVariant::operator=(const wxArrayString& value) +{ + if (GetType() == wxT("arrstring") && + m_data->GetRefCount() == 1) { - wxVariantDataList* data = (wxVariantDataList*) m_data; - return data->GetValue().GetCount(); + ((wxVariantDataArrayString *)GetData())->SetValue(value); } -#if WXWIN_COMPATIBILITY_2_4 - else if (GetType() == wxT("stringlist")) + else { - wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; - return data->GetValue().GetCount(); + UnRef(); + m_data = new wxVariantDataArrayString(value); } -#endif - return 0; } -wxString wxVariant::MakeString() const +wxArrayString wxVariant::GetArrayString() const { - if (!IsNull()) - { - wxString str; - if (GetData()->Write(str)) - return str; - } - return wxEmptyString; + if ( GetType() == wxT("arrstring") ) + return ((wxVariantDataArrayString *)GetData())->GetValue(); + + return wxArrayString(); } -// Accessors +// ---------------------------------------------------------------------------- +// wxVariantDataList +// ---------------------------------------------------------------------------- -void wxVariant::SetData(wxVariantData* data) +class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData { - if (m_data) delete m_data; - m_data = data; -} +public: + wxVariantDataList() {} + wxVariantDataList(const wxVariantList& list); + virtual ~wxVariantDataList(); + wxVariantList& GetValue() { return m_value; } + void SetValue(const wxVariantList& value) ; -// Returns a string representing the type of the variant, -// e.g. "string", "bool", "list", "double", "long" -wxString wxVariant::GetType() const -{ - if (IsNull()) - return wxString(wxT("null")); - else - return m_data->GetType(); -} + 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("list"); } + void Clear(); -bool wxVariant::IsType(const wxString& type) const + wxVariantData* Clone() const { return new wxVariantDataList(m_value); } +protected: + wxVariantList m_value; +}; + +wxVariantDataList::wxVariantDataList(const wxVariantList& list) { - return (GetType() == type); + SetValue(list); } -bool wxVariant::IsValueKindOf(const wxClassInfo* type) const +wxVariantDataList::~wxVariantDataList() { - wxClassInfo* info=m_data->GetValueClassInfo(); - return info ? info->IsKindOf(type) : false ; + Clear(); } - -// Value accessors -double wxVariant::GetReal() const +void wxVariantDataList::SetValue(const wxVariantList& value) { - double value; - if (Convert(& value)) - return value; - else + Clear(); + wxVariantList::compatibility_iterator node = value.GetFirst(); + while (node) { - wxFAIL_MSG(wxT("Could not convert to a real number")); - return 0.0; + wxVariant* var = node->GetData(); + m_value.Append(new wxVariant(*var)); + node = node->GetNext(); } } -long wxVariant::GetInteger() const +void wxVariantDataList::Clear() { - long value; - if (Convert(& value)) - return value; - else + wxVariantList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - wxFAIL_MSG(wxT("Could not convert to an integer")); - return 0; + wxVariant* var = node->GetData(); + delete var; + node = node->GetNext(); } + m_value.Clear(); } -char wxVariant::GetChar() const +bool wxVariantDataList::Eq(wxVariantData& data) const { - char value; - if (Convert(& value)) - return value; - else + wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") ); + + wxVariantDataList& listData = (wxVariantDataList&) data; + wxVariantList::compatibility_iterator node1 = m_value.GetFirst(); + wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst(); + while (node1 && node2) { - wxFAIL_MSG(wxT("Could not convert to a char")); - return 0; + wxVariant* var1 = node1->GetData(); + wxVariant* var2 = node2->GetData(); + if ((*var1) != (*var2)) + return false; + node1 = node1->GetNext(); + node2 = node2->GetNext(); } + if (node1 || node2) return false; + return true; } -bool wxVariant::GetBool() const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Write(wxSTD ostream& str) const { - bool value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a bool")); - return 0; - } + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; } +#endif -wxString wxVariant::GetString() const +bool wxVariantDataList::Write(wxString& str) const { - wxString value; - if (!Convert(& value)) + str = wxEmptyString; + wxVariantList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - wxFAIL_MSG(wxT("Could not convert to a string")); + wxVariant* var = node->GetData(); + if (node != m_value.GetFirst()) + str += wxT(" "); + wxString str1; + str += var->MakeString(); + node = node->GetNext(); } - return value; + return true; } -void* wxVariant::GetVoidPtr() const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) { - wxASSERT( (GetType() == wxT("void*")) ); + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; +} +#endif - return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); +bool wxVariantDataList::Read(wxString& WXUNUSED(str)) +{ + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; } -wxObject* wxVariant::GetWxObjectPtr() +// wxVariant + +wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants { - wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr)); - return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); + m_data = new wxVariantDataList(val); + m_name = name; } -#if wxUSE_DATETIME -wxDateTime wxVariant::GetDateTime() const +bool wxVariant::operator== (const wxVariantList& value) const { - wxDateTime value; - if (!Convert(& value)) - { - wxFAIL_MSG(wxT("Could not convert to a datetime")); - } + wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); - return value; + wxVariantDataList other(value); + return (GetData()->Eq(other)); } -#endif // wxUSE_DATETIME -wxList& wxVariant::GetList() const +bool wxVariant::operator!= (const wxVariantList& value) const { - wxASSERT( (GetType() == wxT("list")) ); - - return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); + return (!((*this) == value)); } -#if WXWIN_COMPATIBILITY_2_4 +void wxVariant::operator= (const wxVariantList& value) +{ + if (GetType() == wxT("list") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataList*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataList(value); + } +} -wxStringList& wxVariant::GetStringList() const +wxVariantList& wxVariant::GetList() const { - wxASSERT( (GetType() == wxT("stringlist")) ); + wxASSERT( (GetType() == wxT("list")) ); - return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); + return (wxVariantList&) ((wxVariantDataList*) m_data)->GetValue(); } -#endif - // Make empty list void wxVariant::NullList() { SetData(new wxVariantDataList()); -}; +} // Append to list void wxVariant::Append(const wxVariant& value) { - wxList& list = GetList(); + wxVariantList& list = GetList(); list.Append(new wxVariant(value)); } @@ -1951,7 +1635,7 @@ void wxVariant::Append(const wxVariant& value) // Insert at front of list void wxVariant::Insert(const wxVariant& value) { - wxList& list = GetList(); + wxVariantList& list = GetList(); list.Insert(new wxVariant(value)); } @@ -1959,12 +1643,12 @@ void wxVariant::Insert(const wxVariant& value) // Returns true if the variant is a member of the list bool wxVariant::Member(const wxVariant& value) const { - wxList& list = GetList(); + wxVariantList& list = GetList(); - wxList::compatibility_iterator node = list.GetFirst(); + wxVariantList::compatibility_iterator node = list.GetFirst(); while (node) { - wxVariant* other = (wxVariant*) node->GetData(); + wxVariant* other = node->GetData(); if (value == *other) return true; node = node->GetNext(); @@ -1973,13 +1657,13 @@ bool wxVariant::Member(const wxVariant& value) const } // Deletes the nth element of the list -bool wxVariant::Delete(int item) +bool wxVariant::Delete(size_t item) { - wxList& list = GetList(); + wxVariantList& list = GetList(); - wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") ); - wxList::compatibility_iterator node = list.Item(item); - wxVariant* variant = (wxVariant*) node->GetData(); + wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") ); + wxVariantList::compatibility_iterator node = list.Item(item); + wxVariant* variant = node->GetData(); delete variant; list.Erase(node); return true; @@ -1994,29 +1678,68 @@ void wxVariant::ClearList() } else { - if (GetType() != wxT("list")) - { - delete m_data; - m_data = NULL; - } + if (!GetType().IsSameAs(wxT("list"))) + UnRef(); + m_data = new wxVariantDataList; } } +// Treat a list variant as an array +wxVariant wxVariant::operator[] (size_t idx) const +{ + wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") ); + + if (GetType() == wxT("list")) + { + wxVariantDataList* data = (wxVariantDataList*) m_data; + wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") ); + return *(data->GetValue().Item(idx)->GetData()); + } + return wxNullVariant; +} + +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() == wxT("list")), wxT("Invalid type for array operator") ); + + wxVariantDataList* data = (wxVariantDataList*) m_data; + wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") ); + + return * (data->GetValue().Item(idx)->GetData()); +} + +// Return the number of elements in a list +size_t wxVariant::GetCount() const +{ + wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") ); + + if (GetType() == wxT("list")) + { + wxVariantDataList* data = (wxVariantDataList*) m_data; + return data->GetValue().GetCount(); + } + return 0; +} + +// ---------------------------------------------------------------------------- // Type conversion +// ---------------------------------------------------------------------------- + bool wxVariant::Convert(long* value) const { wxString type(GetType()); if (type == wxT("double")) - *value = (long) (((wxVariantDataReal*)GetData())->GetValue()); + *value = (long) (((wxVariantDoubleData*)GetData())->GetValue()); else if (type == wxT("long")) *value = ((wxVariantDataLong*)GetData())->GetValue(); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = (long) (((wxVariantDataBool*)GetData())->GetValue()); -#endif else if (type == wxT("string")) - *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue()); + *value = wxAtol(((wxVariantDataString*)GetData())->GetValue()); else return false; @@ -2027,20 +1750,18 @@ bool wxVariant::Convert(bool* value) const { wxString type(GetType()); if (type == wxT("double")) - *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0); + *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0); else if (type == wxT("long")) *value = (((wxVariantDataLong*)GetData())->GetValue() != 0); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = ((wxVariantDataBool*)GetData())->GetValue(); -#endif else if (type == wxT("string")) { wxString val(((wxVariantDataString*)GetData())->GetValue()); val.MakeLower(); - if (val == wxT("true") || val == wxT("yes")) + if (val == wxT("true") || val == wxT("yes") || val == wxT('1') ) *value = true; - else if (val == wxT("false") || val == wxT("no")) + else if (val == wxT("false") || val == wxT("no") || val == wxT('0') ) *value = false; else return false; @@ -2055,38 +1776,52 @@ bool wxVariant::Convert(double* value) const { wxString type(GetType()); if (type == wxT("double")) - *value = ((wxVariantDataReal*)GetData())->GetValue(); + *value = ((wxVariantDoubleData*)GetData())->GetValue(); else if (type == wxT("long")) *value = (double) (((wxVariantDataLong*)GetData())->GetValue()); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = (double) (((wxVariantDataBool*)GetData())->GetValue()); -#endif else if (type == wxT("string")) - *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue()); + *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue()); else return false; return true; } -bool wxVariant::Convert(char* value) const +bool wxVariant::Convert(wxUniChar* value) const { wxString type(GetType()); if (type == wxT("char")) *value = ((wxVariantDataChar*)GetData())->GetValue(); else if (type == wxT("long")) *value = (char) (((wxVariantDataLong*)GetData())->GetValue()); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = (char) (((wxVariantDataBool*)GetData())->GetValue()); -#endif else return false; return true; } +bool wxVariant::Convert(char* value) const +{ + wxUniChar ch; + if ( !Convert(&ch) ) + return false; + *value = ch; + return true; +} + +bool wxVariant::Convert(wchar_t* value) const +{ + wxUniChar ch; + if ( !Convert(&ch) ) + return false; + *value = ch; + return true; +} + bool wxVariant::Convert(wxString* value) const { *value = MakeString(); @@ -2102,10 +1837,26 @@ bool wxVariant::Convert(wxDateTime* value) const *value = ((wxVariantDataDateTime*)GetData())->GetValue(); return true; } + // Fallback to string conversion wxString val; - return Convert(&val) && - (value->ParseDateTime(val) || value->ParseDate(val)); + if ( !Convert(&val) ) + return false; + + // Try to parse this as either date and time, only date or only time + // checking that the entire string was parsed + wxString::const_iterator end; + if ( value->ParseDateTime(val, &end) && end == val.end() ) + return true; + + if ( value->ParseDate(val, &end) && end == val.end() ) + return true; + + if ( value->ParseTime(val, &end) && end == val.end() ) + return true; + + return false; } #endif // wxUSE_DATETIME +#endif // wxUSE_VARIANT