X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57493f9f852d91a5750b4a68053a465f421e12be..472137baebae6c011ad7d70285de454b9ce7796d:/src/common/variant.cpp diff --git a/src/common/variant.cpp b/src/common/variant.cpp index fdaf53ef99..42c9742966 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "variant.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -20,267 +16,223 @@ #pragma hdrstop #endif -#if wxUSE_IOSTREAMH -# include -#else -# include -#endif - -#include "wx/stream.h" -#include "wx/string.h" #include "wx/variant.h" -IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject) +#if wxUSE_VARIANT -wxVariant WXDLLEXPORT wxNullVariant; +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/math.h" + #include "wx/crt.h" + #if wxUSE_STREAMS + #include "wx/stream.h" + #endif +#endif -/* - * wxVariantDataList - */ +#if wxUSE_STD_IOSTREAM + #if wxUSE_IOSTREAMH + #include + #else + #include + #endif +#endif -class WXDLLEXPORT wxVariantDataList: public wxVariantData -{ -DECLARE_DYNAMIC_CLASS(wxVariantDataList) -public: - wxVariantDataList() {} - wxVariantDataList(const wxList& list); - ~wxVariantDataList(); +#if defined(__MWERKS__) && __MSL__ >= 0x6000 +namespace std {} +using namespace std ; +#endif - wxList& GetValue() const { return (wxList&) m_value; } - void SetValue(const wxList& value) ; +#if wxUSE_STREAMS + #include "wx/txtstrm.h" +#endif - virtual void Copy(wxVariantData& data); - virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; - virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); - virtual bool Read(wxString& str); - virtual wxString GetType() const { return "list"; }; +#include "wx/string.h" +#include "wx/tokenzr.h" - void Clear(); +wxVariant WXDLLIMPEXP_BASE wxNullVariant; -protected: - wxList m_value; -}; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData) +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxVariantList) -wxVariantDataList::wxVariantDataList(const wxList& list) -{ - SetValue(list); -} +/* + * wxVariant + */ -wxVariantDataList::~wxVariantDataList() +IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject) + +wxVariant::wxVariant() { - Clear(); + m_data = (wxVariantData*) NULL; } -void wxVariantDataList::SetValue(const wxList& value) +bool wxVariant::IsNull() const { - Clear(); - wxNode* node = value.First(); - while (node) - { - wxVariant* var = (wxVariant*) node->Data(); - m_value.Append(new wxVariant(*var)); - node = node->Next(); - } + return (m_data == (wxVariantData*) NULL); } -void wxVariantDataList::Clear() +void wxVariant::MakeNull() { - wxNode* node = m_value.First(); - while (node) - { - wxVariant* var = (wxVariant*) node->Data(); - delete var; - node = node->Next(); - } - m_value.Clear(); + UnRef(); } -void wxVariantDataList::Copy(wxVariantData& data) +void wxVariant::Clear() { - wxASSERT_MSG( (data.GetType() == "list"), "wxVariantDataList::Copy: Can't copy to this type of data" ); - - wxVariantDataList& listData = (wxVariantDataList&) data; - - listData.Clear(); - wxNode* node = m_value.First(); - while (node) - { - wxVariant* var = (wxVariant*) node->Data(); - listData.m_value.Append(new wxVariant(*var)); - node = node->Next(); - } + m_name = wxEmptyString; } -bool wxVariantDataList::Eq(wxVariantData& data) const +wxVariant::wxVariant(const wxVariant& variant) + : wxObject() { - wxASSERT_MSG( (data.GetType() == "list"), "wxVariantDataList::Eq: argument mismatch" ); + m_data = (wxVariantData*) NULL; - wxVariantDataList& listData = (wxVariantDataList&) data; - wxNode* node1 = m_value.First(); - wxNode* node2 = listData.GetValue().First(); - while (node1 && node2) - { - wxVariant* var1 = (wxVariant*) node1->Data(); - wxVariant* var2 = (wxVariant*) node2->Data(); - if ((*var1) != (*var2)) - return FALSE; - node1 = node1->Next(); - node2 = node2->Next(); - } - if (node1 || node2) return FALSE; - return TRUE; + if (!variant.IsNull()) + Ref(variant); + + m_name = variant.m_name; } -bool wxVariantDataList::Write(ostream& str) const +wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data { - wxString s; - Write(s); - str << (const char*) s; - return TRUE; + m_data = data; + m_name = name; } -bool wxVariantDataList::Write(wxString& str) const +wxVariant::~wxVariant() { - str = ""; - wxNode* node = m_value.First(); - while (node) - { - wxVariant* var = (wxVariant*) node->Data(); - if (node != m_value.First()) - str += " "; - wxString str1; - str += var->MakeString(); - node = node->Next(); - } - - return TRUE; + UnRef(); } -bool wxVariantDataList::Read(istream& WXUNUSED(str)) +// Assignment +void wxVariant::operator= (const wxVariant& variant) { - wxFAIL_MSG("Unimplemented"); - // TODO - return FALSE; + Ref(variant); + m_name = variant.m_name; } -bool wxVariantDataList::Read(wxString& WXUNUSED(str)) +// myVariant = new wxStringVariantData("hello") +void wxVariant::operator= (wxVariantData* variantData) { - wxFAIL_MSG("Unimplemented"); - // TODO - return FALSE; + UnRef(); + m_data = variantData; } -/* - * wxVariantDataStringList - */ - -class WXDLLEXPORT 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; - virtual bool Write(ostream& str) const; - virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); - virtual bool Read(wxString& str); - virtual wxString GetType() const { return "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() == "stringlist"), "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() == "stringlist"), "wxVariantDataStringList::Eq: argument mismatch" ); + // nothing to be done + if (m_data == clone.m_data) + return; - wxVariantDataStringList& listData = (wxVariantDataStringList&) data; - wxNode* node1 = m_value.First(); - wxNode* node2 = listData.GetValue().First(); - while (node1 && node2) + // delete reference to old data + UnRef(); + + // reference new data + if ( clone.m_data ) { - wxString str1 ((char*) node1->Data()); - wxString str2 ((char*) node2->Data()); - if (str1 != str2) - return FALSE; - node1 = node1->Next(); - node2 = node2->Next(); + m_data = clone.m_data; + m_data->m_count++; } - if (node1 || node2) return FALSE; - return TRUE; } -bool wxVariantDataStringList::Write(ostream& str) const + +void wxVariant::UnRef() { - wxString s; - Write(s); - str << (const char*) s; - return TRUE; + if ( m_data ) + { + wxASSERT_MSG( m_data->m_count > 0, _T("invalid ref data count") ); + + m_data->DecRef(); + m_data = NULL; + } } -bool wxVariantDataStringList::Write(wxString& str) const +bool wxVariant::Unshare() { - str = ""; - wxNode* node = m_value.First(); - while (node) + if ( m_data && m_data->GetRefCount() > 1 ) { - char* s = (char*) node->Data(); - if (node != m_value.First()) - str += " "; - str += s; - node = node->Next(); + // 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(); } -bool wxVariantDataStringList::Read(istream& WXUNUSED(str)) + +bool wxVariant::IsType(const wxString& type) const { - wxFAIL_MSG("Unimplemented"); - // TODO - return FALSE; + return (GetType() == type); } -bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) +bool wxVariant::IsValueKindOf(const wxClassInfo* type) const { - wxFAIL_MSG("Unimplemented"); - // TODO - return FALSE; + wxClassInfo* info=GetData()->GetValueClassInfo(); + return info ? info->IsKindOf(type) : false ; } -/* - * wxVariantDataLong - */ -class WXDLLEXPORT wxVariantDataLong: public wxVariantData +// ----------------------------------------------------------------- +// wxVariantDataLong +// ----------------------------------------------------------------- + +class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataLong) public: wxVariantDataLong() { m_value = 0; } wxVariantDataLong(long value) { m_value = value; } @@ -288,725 +240,654 @@ 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); virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); - virtual bool Write(ostream& str) const; - +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); + virtual bool Write(wxSTD ostream& str) const; +#endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return "long"; }; + 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() == "long"), "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() == "long"), "wxVariantDataLong::Eq: argument mismatch" ); + wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") ); wxVariantDataLong& otherData = (wxVariantDataLong&) data; return (otherData.m_value == m_value); } -bool wxVariantDataLong::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataLong::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; - return TRUE; + str << (const char*) s.mb_str(); + return true; } +#endif bool wxVariantDataLong::Write(wxString& str) const { - str.Printf("%ld", m_value); - return TRUE; + str.Printf(wxT("%ld"), m_value); + return true; } -bool wxVariantDataLong::Read(istream& str) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataLong::Read(wxSTD istream& str) { str >> m_value; - return TRUE; + return true; } +#endif #if wxUSE_STREAMS bool wxVariantDataLong::Write(wxOutputStream& str) const { - str << m_value; - return TRUE; + wxTextOutputStream s(str); + + s.Write32((size_t)m_value); + return true; } bool wxVariantDataLong::Read(wxInputStream& str) { - str >> m_value; - return TRUE; + wxTextInputStream s(str); + m_value = s.Read32(); + return true; } #endif // wxUSE_STREAMS bool wxVariantDataLong::Read(wxString& str) { - m_value = atol((const char*) str); - return TRUE; + m_value = wxAtol(str); + return true; } -/* - * wxVariantDataReal - */ - -class WXDLLEXPORT wxVariantDataReal: public wxVariantData -{ -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); - virtual bool Write(ostream& str) const; - virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream &str) const; -#endif // wxUSE_STREAMS - virtual wxString GetType() const { return "double"; }; - -protected: - double m_value; -}; - -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData) - -void wxVariantDataReal::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == "double"), "wxVariantDataReal::Copy: Can't copy to this type of data" ); - - wxVariantDataReal& otherData = (wxVariantDataReal&) data; - - otherData.m_value = m_value; -} +// wxVariant -bool wxVariantDataReal::Eq(wxVariantData& data) const +wxVariant::wxVariant(long val, const wxString& name) { - wxASSERT_MSG( (data.GetType() == "double"), "wxVariantDataReal::Eq: argument mismatch" ); - - wxVariantDataReal& otherData = (wxVariantDataReal&) data; - - return (otherData.m_value == m_value); + m_data = new wxVariantDataLong(val); + m_name = name; } -bool wxVariantDataReal::Write(ostream& str) const +wxVariant::wxVariant(int val, const wxString& name) { - wxString s; - Write(s); - str << (const char*) s; - return TRUE; + m_data = new wxVariantDataLong((long)val); + m_name = name; } -bool wxVariantDataReal::Write(wxString& str) const +wxVariant::wxVariant(short val, const wxString& name) { - str.Printf("%.4f", m_value); - return TRUE; + m_data = new wxVariantDataLong((long)val); + m_name = name; } -bool wxVariantDataReal::Read(istream& str) +bool wxVariant::operator== (long value) const { - str >> m_value; - return TRUE; + long thisValue; + if (!Convert(&thisValue)) + return false; + else + return (value == thisValue); } -#if wxUSE_STREAMS -bool wxVariantDataReal::Write(wxOutputStream& str) const +bool wxVariant::operator!= (long value) const { - str << m_value; - return TRUE; + return (!((*this) == value)); } -bool wxVariantDataReal::Read(wxInputStream& str) +void wxVariant::operator= (long value) { - str >> (float&)m_value; - return TRUE; + if (GetType() == wxT("long") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataLong*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataLong(value); + } } -#endif // wxUSE_STREAMS -bool wxVariantDataReal::Read(wxString& str) +long wxVariant::GetLong() const { - m_value = atof((const char*) str); - return TRUE; + long value; + if (Convert(& value)) + return value; + else + { + wxFAIL_MSG(wxT("Could not convert to a long")); + return 0; + } } -#ifdef HAVE_BOOL -/* - * wxVariantDataBool - */ +// ----------------------------------------------------------------- +// wxVariantDoubleData +// ----------------------------------------------------------------- -class WXDLLEXPORT wxVariantDataBool: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataBool) public: - wxVariantDataBool() { m_value = 0; } - wxVariantDataBool(bool value) { m_value = value; } + wxVariantDoubleData() { m_value = 0.0; } + wxVariantDoubleData(double value) { m_value = value; } - inline bool GetValue() const { return m_value; } - inline void SetValue(bool 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 Write(ostream& str) const; - virtual bool Write(wxString& str) const; virtual bool Read(wxString& str); - virtual bool Read(istream& 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; + virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return "bool"; }; + virtual wxString GetType() const { return wxT("double"); } + wxVariantData* Clone() const { return new wxVariantDoubleData(m_value); } protected: - bool m_value; + double m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData) - -void wxVariantDataBool::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == "bool"), "wxVariantDataBool::Copy: Can't copy to this type of data" ); - - wxVariantDataBool& otherData = (wxVariantDataBool&) data; - - otherData.m_value = m_value; -} - -bool wxVariantDataBool::Eq(wxVariantData& data) const +bool wxVariantDoubleData::Eq(wxVariantData& data) const { - wxASSERT_MSG( (data.GetType() == "bool"), "wxVariantDataBool::Eq: argument mismatch" ); + wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") ); - wxVariantDataBool& otherData = (wxVariantDataBool&) data; + wxVariantDoubleData& otherData = (wxVariantDoubleData&) data; - return (otherData.m_value == m_value); + return wxIsSameDouble(otherData.m_value, m_value); } -bool wxVariantDataBool::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDoubleData::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; - return TRUE; + str << (const char*) s.mb_str(); + return true; } +#endif -bool wxVariantDataBool::Write(wxString& str) const +bool wxVariantDoubleData::Write(wxString& str) const { - str.Printf("%d", (int) m_value); - return TRUE; + str.Printf(wxT("%.14g"), m_value); + return true; } -bool wxVariantDataBool::Read(istream& WXUNUSED(str)) +#if wxUSE_STD_IOSTREAM +bool wxVariantDoubleData::Read(wxSTD istream& str) { - wxFAIL_MSG("Unimplemented"); -// str >> (long) m_value; - return FALSE; + str >> m_value; + return true; } +#endif #if wxUSE_STREAMS -bool wxVariantDataBool::Write(wxOutputStream& str) const +bool wxVariantDoubleData::Write(wxOutputStream& str) const { - str << (char)m_value; - return TRUE; + wxTextOutputStream s(str); + s.WriteDouble((double)m_value); + return true; } -bool wxVariantDataBool::Read(wxInputStream& str) +bool wxVariantDoubleData::Read(wxInputStream& str) { - str >> (char&)m_value; - return TRUE; + wxTextInputStream s(str); + m_value = (float)s.ReadDouble(); + return true; } #endif // wxUSE_STREAMS -bool wxVariantDataBool::Read(wxString& str) +bool wxVariantDoubleData::Read(wxString& str) { - m_value = (atol((const char*) str) != 0); - return TRUE; + m_value = wxAtof(str); + return true; } -#endif // HAVE_BOOL -/* - * wxVariantDataChar - */ - -class WXDLLEXPORT wxVariantDataChar: public wxVariantData -{ -DECLARE_DYNAMIC_CLASS(wxVariantDataChar) -public: - wxVariantDataChar() { m_value = 0; } - wxVariantDataChar(char value) { m_value = value; } - - inline char GetValue() const { return m_value; } - inline void SetValue(char value) { m_value = value; } - - virtual void Copy(wxVariantData& data); - virtual bool Eq(wxVariantData& data) const; - virtual bool Read(istream& str); - virtual bool Write(ostream& str) const; - virtual bool Read(wxString& str); - virtual bool Write(wxString& str) const; -#if wxUSE_STREAMS - virtual bool Read(wxInputStream& str); - virtual bool Write(wxOutputStream& str) const; -#endif // wxUSE_STREAMS - virtual wxString GetType() const { return "char"; }; - -protected: - char m_value; -}; - -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData) +// wxVariant double code -void wxVariantDataChar::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == "char"), "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() == "char"), "wxVariantDataChar::Eq: argument mismatch" ); - - wxVariantDataChar& otherData = (wxVariantDataChar&) data; - - return (otherData.m_value == m_value); -} - -bool wxVariantDataChar::Write(ostream& str) const +wxVariant::wxVariant(double val, const wxString& name) { - wxString s; - Write(s); - str << (const char*) s; - return TRUE; + m_data = new wxVariantDoubleData(val); + m_name = name; } -bool wxVariantDataChar::Write(wxString& str) const +bool wxVariant::operator== (double value) const { - str.Printf("%c", m_value); - return TRUE; -} + double thisValue; + if (!Convert(&thisValue)) + return false; -bool wxVariantDataChar::Read(istream& WXUNUSED(str)) -{ - wxFAIL_MSG("Unimplemented"); -// str >> m_value; - return FALSE; + return wxIsSameDouble(value, thisValue); } -#if wxUSE_STREAMS -bool wxVariantDataChar::Write(wxOutputStream& str) const +bool wxVariant::operator!= (double value) const { - str << m_value; - return TRUE; + return (!((*this) == value)); } -bool wxVariantDataChar::Read(wxInputStream& str) +void wxVariant::operator= (double value) { - str >> m_value; - return TRUE; + if (GetType() == wxT("double") && + m_data->GetRefCount() == 1) + { + ((wxVariantDoubleData*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDoubleData(value); + } } -#endif // wxUSE_STREAMS -bool wxVariantDataChar::Read(wxString& str) +double wxVariant::GetDouble() const { - m_value = str[(size_t)0]; - return TRUE; + double value; + if (Convert(& value)) + return value; + else + { + wxFAIL_MSG(wxT("Could not convert to a double number")); + return 0.0; + } } -/* - * wxVariantDataString - */ +// ----------------------------------------------------------------- +// wxVariantBoolData +// ----------------------------------------------------------------- -#if defined(__BORLANDC__) && defined(__WIN16__) -// Change name because of truncation -#define wxVariantDataString wxVariantStringData -#endif +#ifdef HAVE_BOOL -class WXDLLEXPORT wxVariantDataString: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataBool: 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; } + wxVariantDataBool() { m_value = 0; } + wxVariantDataBool(bool value) { m_value = value; } - inline wxString GetValue() const { return m_value; } - inline void SetValue(const wxString& value) { m_value = value; } + 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; - virtual bool Write(ostream& str) const; - virtual bool Read(wxString& str); +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); + virtual bool Read(wxString& str); +#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 "string"; }; + virtual wxString GetType() const { return wxT("bool"); } + wxVariantData* Clone() const { return new wxVariantDataBool(m_value); } protected: - wxString m_value; + bool m_value; }; -void wxVariantDataString::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == "string"), "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 +bool wxVariantDataBool::Eq(wxVariantData& data) const { - wxASSERT_MSG( (data.GetType() == "string"), "wxVariantDataString::Eq: argument mismatch" ); + wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") ); - wxVariantDataString& otherData = (wxVariantDataString&) data; + wxVariantDataBool& otherData = (wxVariantDataBool&) data; return (otherData.m_value == m_value); } -bool wxVariantDataString::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataBool::Write(wxSTD ostream& str) const { - str << (const char*) m_value; - return TRUE; + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; } +#endif -bool wxVariantDataString::Write(wxString& str) const +bool wxVariantDataBool::Write(wxString& str) const { - str = m_value; - return TRUE; + str.Printf(wxT("%d"), (int) m_value); + return true; } -bool wxVariantDataString::Read(istream& str) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str)) { - str >> m_value; - return TRUE; + wxFAIL_MSG(wxT("Unimplemented")); +// str >> (long) m_value; + return false; } +#endif #if wxUSE_STREAMS -bool wxVariantDataString::Write(wxOutputStream& str) const +bool wxVariantDataBool::Write(wxOutputStream& str) const { - str << (const char*) m_value; - return TRUE; + wxTextOutputStream s(str); + + s.Write8(m_value); + return true; } -bool wxVariantDataString::Read(wxInputStream& str) +bool wxVariantDataBool::Read(wxInputStream& str) { - str >> m_value; - return TRUE; + wxTextInputStream s(str); + + m_value = s.Read8() != 0; + return true; } #endif // wxUSE_STREAMS -bool wxVariantDataString::Read(wxString& str) +bool wxVariantDataBool::Read(wxString& str) { - m_value = str; - return TRUE; + m_value = (wxAtol(str) != 0); + return true; } -#if defined(__BORLANDC__) && defined(__WIN16__) -IMPLEMENT_DYNAMIC_CLASS(wxVariantStringData, wxVariantData) -#else -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) -#endif - -/* - * wxVariantDataTime - */ - -#if wxUSE_TIMEDATE - -class wxVariantDataTime: public wxVariantData -{ - DECLARE_DYNAMIC_CLASS(wxVariantDataTime) -public: - wxVariantDataTime() { } - wxVariantDataTime(const wxTime& value) { m_value = value; } - - inline wxTime GetValue() const { return m_value; } - inline void SetValue(const wxTime& value) { m_value = value; } - - virtual void Copy(wxVariantData& data); - virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; - virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); - virtual bool Read(wxString& str); - virtual wxString GetType() const { return "time"; }; - virtual wxVariantData* Clone() { return new wxVariantDataTime; } +// wxVariant **** -protected: - wxTime m_value; -}; - -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData) - -void wxVariantDataTime::Copy(wxVariantData& data) +wxVariant::wxVariant(bool val, const wxString& name) { - wxASSERT_MSG( (data.GetType() == "time"), "wxVariantDataTime::Copy: Can't copy to this type of data" ); - - wxVariantDataTime& otherData = (wxVariantDataTime&) data; - - otherData.m_value = m_value; + m_data = new wxVariantDataBool(val); + m_name = name; } -bool wxVariantDataTime::Eq(wxVariantData& data) const +bool wxVariant::operator== (bool value) const { - wxASSERT_MSG( (data.GetType() == "time"), "wxVariantDataTime::Eq: argument mismatch" ); - - wxVariantDataTime& otherData = (wxVariantDataTime&) data; - - return (otherData.m_value == m_value); + bool thisValue; + if (!Convert(&thisValue)) + return false; + else + return (value == thisValue); } -bool wxVariantDataTime::Write(ostream& str) const +bool wxVariant::operator!= (bool value) const { - wxString s; - Write(s); - str << (const char*) s; - return TRUE; + return (!((*this) == value)); } -bool wxVariantDataTime::Write(wxString& str) const +void wxVariant::operator= (bool value) { - char*s = m_value.FormatTime(); - str = s; - return TRUE; + if (GetType() == wxT("bool") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataBool*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataBool(value); + } } -bool wxVariantDataTime::Read(istream& WXUNUSED(str)) +bool wxVariant::GetBool() const { - // Not implemented - return FALSE; + bool value; + if (Convert(& value)) + return value; + else + { + wxFAIL_MSG(wxT("Could not convert to a bool")); + return 0; + } } -bool wxVariantDataTime::Read(wxString& WXUNUSED(str)) -{ - // Not implemented - return FALSE; -} +#endif // HAVE_BOOL -/* - * wxVariantDataDate - */ +// ----------------------------------------------------------------- +// wxVariantDataChar +// ----------------------------------------------------------------- -class wxVariantDataDate: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData { - DECLARE_DYNAMIC_CLASS(wxVariantDataDate) public: - wxVariantDataDate() { } - wxVariantDataDate(const wxDate& value) { m_value = value; } + wxVariantDataChar() { m_value = 0; } + wxVariantDataChar(const wxUniChar& value) { m_value = value; } - inline wxDate GetValue() const { return m_value; } - inline void SetValue(const wxDate& 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; - virtual bool Write(ostream& str) const; - virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); + virtual bool Write(wxSTD ostream& str) const; +#endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return "date"; }; - virtual wxVariantData* Clone() { return new wxVariantDataDate; } + virtual bool Write(wxString& str) const; +#if wxUSE_STREAMS + virtual bool Read(wxInputStream& str); + virtual bool Write(wxOutputStream& str) const; +#endif // wxUSE_STREAMS + virtual wxString GetType() const { return wxT("char"); } + wxVariantData* Clone() const { return new wxVariantDataChar(m_value); } protected: - wxDate m_value; + wxUniChar m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData) - -void wxVariantDataDate::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == "date"), "wxVariantDataDate::Copy: Can't copy to this type of data" ); - - wxVariantDataDate& otherData = (wxVariantDataDate&) data; - - otherData.m_value = m_value; -} - -bool wxVariantDataDate::Eq(wxVariantData& data) const +bool wxVariantDataChar::Eq(wxVariantData& data) const { - wxASSERT_MSG( (data.GetType() == "date"), "wxVariantDataDate::Eq: argument mismatch" ); + wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") ); - wxVariantDataDate& otherData = (wxVariantDataDate&) data; + wxVariantDataChar& otherData = (wxVariantDataChar&) data; return (otherData.m_value == m_value); } -bool wxVariantDataDate::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataChar::Write(wxSTD ostream& str) const { - wxString s; - Write(s); - str << (const char*) s; - return TRUE; + str << wxString(m_value); + return true; } +#endif -bool wxVariantDataDate::Write(wxString& str) const +bool wxVariantDataChar::Write(wxString& str) const { - str = m_value.FormatDate(); - return TRUE; + str = m_value; + return true; } -bool wxVariantDataDate::Read(istream& WXUNUSED(str)) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) { - // Not implemented - return FALSE; -} + wxFAIL_MSG(wxT("Unimplemented")); -bool wxVariantDataDate::Read(wxString& WXUNUSED(str)) -{ - // Not implemented - return FALSE; + return false; } #endif - // wxUSE_TIMEDATE -/* - * wxVariantDataVoidPtr - */ - -class wxVariantDataVoidPtr: public wxVariantData +#if wxUSE_STREAMS +bool wxVariantDataChar::Write(wxOutputStream& str) const { -DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr) -public: - wxVariantDataVoidPtr() { } - wxVariantDataVoidPtr(void* value) { m_value = value; } + wxTextOutputStream s(str); - 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; - virtual bool Write(ostream& str) const; - virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); - virtual bool Read(wxString& str); - virtual wxString GetType() const { return "void*"; }; - virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } - -protected: - void* 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; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData) + return true; +} -void wxVariantDataVoidPtr::Copy(wxVariantData& data) +bool wxVariantDataChar::Read(wxInputStream& str) { - wxASSERT_MSG( (data.GetType() == "void*"), "wxVariantDataVoidPtr::Copy: Can't copy to this type of data" ); + wxTextInputStream s(str); - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; + // 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; - otherData.m_value = m_value; + return true; } +#endif // wxUSE_STREAMS -bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const +bool wxVariantDataChar::Read(wxString& str) { - wxASSERT_MSG( (data.GetType() == "void*"), "wxVariantDataVoidPtr::Eq: argument mismatch" ); + m_value = str[0u]; + return true; +} - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; +wxVariant::wxVariant(const wxUniChar& val, const wxString& name) +{ + m_data = new wxVariantDataChar(val); + m_name = name; +} - return (otherData.m_value == m_value); +wxVariant::wxVariant(char val, const wxString& name) +{ + m_data = new wxVariantDataChar(val); + m_name = name; } -bool wxVariantDataVoidPtr::Write(ostream& str) const +wxVariant::wxVariant(wchar_t val, const wxString& name) { - wxString s; - Write(s); - str << (const char*) s; - return TRUE; + m_data = new wxVariantDataChar(val); + m_name = name; } -bool wxVariantDataVoidPtr::Write(wxString& str) const +bool wxVariant::operator==(const wxUniChar& value) const { - char buf[80]; - sprintf(buf, "%ld", (long) m_value); - str = buf; - return TRUE; + wxUniChar thisValue; + if (!Convert(&thisValue)) + return false; + else + return (value == thisValue); } -bool wxVariantDataVoidPtr::Read(istream& WXUNUSED(str)) +wxVariant& wxVariant::operator=(const wxUniChar& value) { - // Not implemented - return FALSE; + if (GetType() == wxT("char") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataChar*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataChar(value); + } + + return *this; } -bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) +wxUniChar wxVariant::GetChar() const { - // Not implemented - return FALSE; + wxUniChar value; + if (Convert(& value)) + return value; + else + { + wxFAIL_MSG(wxT("Could not convert to a char")); + return wxUniChar(0); + } } +// ---------------------------------------------------------------------------- +// wxVariantDataString +// ---------------------------------------------------------------------------- -/* - * wxVariant - */ +class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData +{ +public: + wxVariantDataString() { } + wxVariantDataString(const wxString& value) { m_value = value; } + + inline wxString GetValue() const { return m_value; } + inline void SetValue(const wxString& value) { m_value = value; } + + virtual bool Eq(wxVariantData& data) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif + virtual bool Read(wxString& str); + virtual bool Write(wxString& str) const; +#if wxUSE_STD_IOSTREAM + 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"); } + wxVariantData* Clone() const { return new wxVariantDataString(m_value); } + +protected: + wxString m_value; +}; + +bool wxVariantDataString::Eq(wxVariantData& data) const +{ + wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") ); + + wxVariantDataString& otherData = (wxVariantDataString&) data; -IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject) + return (otherData.m_value == m_value); +} -// Construction & destruction -wxVariant::wxVariant() +#if wxUSE_STD_IOSTREAM +bool wxVariantDataString::Write(wxSTD ostream& str) const { - m_data = (wxVariantData*) NULL; + str << (const char*) m_value.mb_str(); + return true; } +#endif -wxVariant::wxVariant(double val, const wxString& name) +bool wxVariantDataString::Write(wxString& str) const { - m_data = new wxVariantDataReal(val); - m_name = name; + str = m_value; + return true; } -wxVariant::wxVariant(long val, const wxString& name) +#if wxUSE_STREAMS +bool wxVariantDataString::Write(wxOutputStream& str) const { - m_data = new wxVariantDataLong(val); - m_name = name; + // why doesn't wxOutputStream::operator<< take "const wxString&" + wxTextOutputStream s(str); + s.WriteString(m_value); + return true; } -#ifdef HAVE_BOOL -wxVariant::wxVariant(bool val, const wxString& name) +bool wxVariantDataString::Read(wxInputStream& str) { - m_data = new wxVariantDataBool(val); - m_name = name; + wxTextInputStream s(str); + + m_value = s.ReadLine(); + return true; } -#endif +#endif // wxUSE_STREAMS -wxVariant::wxVariant(char val, const wxString& name) +bool wxVariantDataString::Read(wxString& str) { - m_data = new wxVariantDataChar(val); - m_name = name; + m_value = str; + return true; } +// wxVariant **** + wxVariant::wxVariant(const wxString& val, const wxString& name) { m_data = new wxVariantDataString(val); @@ -1019,606 +900,726 @@ wxVariant::wxVariant(const char* val, const wxString& name) m_name = name; } -wxVariant::wxVariant(const wxStringList& val, const wxString& name) +wxVariant::wxVariant(const wchar_t* val, const wxString& name) { - m_data = new wxVariantDataStringList(val); + m_data = new wxVariantDataString(wxString(val)); m_name = name; } -wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants +wxVariant::wxVariant(const wxCStrData& val, const wxString& name) { - m_data = new wxVariantDataList(val); + m_data = new wxVariantDataString(val.AsString()); m_name = name; } -#if wxUSE_TIMEDATE -wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time +wxVariant::wxVariant(const wxCharBuffer& val, const wxString& name) { - m_data = new wxVariantDataTime(val); + m_data = new wxVariantDataString(wxString(val)); m_name = name; } -wxVariant::wxVariant(const wxDate& val, const wxString& name) // Date +wxVariant::wxVariant(const wxWCharBuffer& val, const wxString& name) { - m_data = new wxVariantDataDate(val); + m_data = new wxVariantDataString(wxString(val)); m_name = name; } -#endif -wxVariant::wxVariant(void* val, const wxString& name) // Void ptr +bool wxVariant::operator== (const wxString& value) const { - m_data = new wxVariantDataVoidPtr(val); - m_name = name; + wxString thisValue; + if (!Convert(&thisValue)) + return false; + + return value == thisValue; } -wxVariant::wxVariant(const wxVariant& variant) +bool wxVariant::operator!= (const wxString& value) const { - if (!variant.IsNull()) + return (!((*this) == value)); +} + +wxVariant& wxVariant::operator= (const wxString& value) +{ + if (GetType() == wxT("string") && + m_data->GetRefCount() == 1) { - m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject(); - variant.m_data->Copy(*m_data); + ((wxVariantDataString*)GetData())->SetValue(value); } else - m_data = (wxVariantData*) NULL; - m_name = variant.m_name; + { + UnRef(); + m_data = new wxVariantDataString(value); + } + return *this; } -wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data +wxString wxVariant::GetString() const { - m_data = data; - m_name = name; + wxString value; + if (!Convert(& value)) + { + wxFAIL_MSG(wxT("Could not convert to a string")); + } + + return value; } -wxVariant::~wxVariant() +// ---------------------------------------------------------------------------- +// wxVariantDataWxObjectPtr +// ---------------------------------------------------------------------------- + +class wxVariantDataWxObjectPtr: public wxVariantData { - delete m_data; -} +public: + wxVariantDataWxObjectPtr() { } + wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; } + inline wxObject* GetValue() const { return m_value; } + inline void SetValue(wxObject* value) { m_value = value; } -// Make NULL (i.e. delete the data) -void wxVariant::MakeNull() + 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() const { return new wxVariantDataWxObjectPtr(m_value); } + + virtual wxClassInfo* GetValueClassInfo(); + +protected: + wxObject* m_value; +}; + +bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const { - delete m_data; - m_data = NULL; + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") ); + + wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data; + + return (otherData.m_value == m_value); } -// Generic operators -// Assignment -void wxVariant::operator= (const wxVariant& variant) +wxString wxVariantDataWxObjectPtr::GetType() const { - if (variant.IsNull()) - { - MakeNull(); - return; - } + wxString returnVal(wxT("wxObject*")); - if (IsNull() || (GetType() != variant.GetType())) + if (m_value) { - if (m_data) - delete m_data; - m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject(); + returnVal = m_value->GetClassInfo()->GetClassName(); + returnVal += wxT("*"); } -// GetData()->Copy(* variant.GetData()); - variant.GetData()->Copy(* GetData()); -} -// Assignment using data, e.g. -// myVariant = new wxStringVariantData("hello") -void wxVariant::operator= (wxVariantData* variantData) -{ - MakeNull(); - m_data = variantData; + return returnVal; } -bool wxVariant::operator== (const wxVariant& variant) const +wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo() { - if (IsNull() || variant.IsNull()) - return (IsNull() == variant.IsNull()); + wxClassInfo* returnVal=NULL; - return (GetData()->Eq(* variant.GetData())); + if (m_value) returnVal = m_value->GetClassInfo(); + + return returnVal; } -bool wxVariant::operator!= (const wxVariant& variant) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const { - return (!(*this == variant)); + 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(), wx_static_cast(void*, m_value)); + return true; +} -// Specific operators -bool wxVariant::operator== (double value) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str)) { - double thisValue; - if (!Convert(&thisValue)) - return FALSE; - else - return (value == thisValue); + // Not implemented + return false; } +#endif -bool wxVariant::operator!= (double value) const +bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str)) { - return (!((*this) == value)); + // Not implemented + return false; } -void wxVariant::operator= (double value) +// wxVariant + +wxVariant::wxVariant( wxObject* val, const wxString& name) { - if (GetType() == "double") - { - ((wxVariantDataReal*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataReal(value); - } + m_data = new wxVariantDataWxObjectPtr(val); + m_name = name; } -bool wxVariant::operator== (long value) const +bool wxVariant::operator== (wxObject* value) const { - long thisValue; - if (!Convert(&thisValue)) - return FALSE; - else - return (value == thisValue); + return (value == ((wxVariantDataWxObjectPtr*)GetData())->GetValue()); } -bool wxVariant::operator!= (long value) const +bool wxVariant::operator!= (wxObject* value) const { - return (!((*this) == value)); + return (!((*this) == (wxObject*) value)); } -void wxVariant::operator= (long value) +void wxVariant::operator= (wxObject* value) { - if (GetType() == "long") - { - ((wxVariantDataLong*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataLong(value); - } + UnRef(); + m_data = new wxVariantDataWxObjectPtr(value); } -bool wxVariant::operator== (char value) const +wxObject* wxVariant::GetWxObjectPtr() const { - char thisValue; - if (!Convert(&thisValue)) - return FALSE; - else - return (value == thisValue); + return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); } -bool wxVariant::operator!= (char value) const +// ---------------------------------------------------------------------------- +// wxVariantDataVoidPtr +// ---------------------------------------------------------------------------- + +class wxVariantDataVoidPtr: public wxVariantData { - return (!((*this) == value)); +public: + wxVariantDataVoidPtr() { } + wxVariantDataVoidPtr(void* value) { m_value = value; } + + inline void* GetValue() const { return m_value; } + inline void SetValue(void* 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("void*"); } + virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); } + +protected: + void* m_value; +}; + +bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const +{ + wxASSERT_MSG( data.GetType() == wxT("void*"), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") ); + + wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; + + return (otherData.m_value == m_value); } -void wxVariant::operator= (char value) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const { - if (GetType() == "char") - { - ((wxVariantDataChar*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataChar(value); - } + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; } +#endif -#ifdef HAVE_BOOL -bool wxVariant::operator== (bool value) const +bool wxVariantDataVoidPtr::Write(wxString& str) const { - bool thisValue; - if (!Convert(&thisValue)) - return FALSE; - else - return (value == thisValue); + str.Printf(wxT("%p"), m_value); + return true; } -bool wxVariant::operator!= (bool value) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) { - return (!((*this) == value)); + // Not implemented + return false; } +#endif -void wxVariant::operator= (bool value) +bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) { - if (GetType() == "bool") - { - ((wxVariantDataBool*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataBool(value); - } + // Not implemented + return false; } -#endif // HAVE_BOOL -bool wxVariant::operator== (const wxString& value) const +// wxVariant + +wxVariant::wxVariant( void* val, const wxString& name) { - wxString thisValue; - if (!Convert(&thisValue)) - return FALSE; - else - return (value == thisValue); + m_data = new wxVariantDataVoidPtr(val); + m_name = name; } -bool wxVariant::operator!= (const wxString& value) const +bool wxVariant::operator== (void* value) const { - return (!((*this) == value)); + return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); } -void wxVariant::operator= (const wxString& value) +bool wxVariant::operator!= (void* value) const { - if (GetType() == "string") - { - ((wxVariantDataString*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataString(value); - } + return (!((*this) == (void*) value)); } -void wxVariant::operator= (const char* value) +void wxVariant::operator= (void* value) { - if (GetType() == "string") + if (GetType() == wxT("void*") && (m_data->GetRefCount() == 1)) { - ((wxVariantDataString*)GetData())->SetValue(wxString(value)); + ((wxVariantDataVoidPtr*)GetData())->SetValue(value); } else { - if (m_data) - delete m_data; - m_data = new wxVariantDataString(wxString(value)); + UnRef(); + m_data = new wxVariantDataVoidPtr(value); } } -bool wxVariant::operator== (const wxStringList& value) const +void* wxVariant::GetVoidPtr() const { - wxASSERT_MSG( (GetType() == "stringlist"), "Invalid type for == operator" ); + wxASSERT( (GetType() == wxT("void*")) ); - wxVariantDataStringList other(value); - return (m_data->Eq(other)); + return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); } -bool wxVariant::operator!= (const wxStringList& value) const +// ---------------------------------------------------------------------------- +// wxVariantDataDateTime +// ---------------------------------------------------------------------------- + +#if wxUSE_DATETIME + +class wxVariantDataDateTime: public wxVariantData { - return (!((*this) == value)); +public: + wxVariantDataDateTime() { } + wxVariantDataDateTime(const wxDateTime& value) { m_value = value; } + + inline wxDateTime GetValue() const { return m_value; } + inline void SetValue(const wxDateTime& 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("datetime"); } + virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); } + +protected: + wxDateTime m_value; +}; + + +bool wxVariantDataDateTime::Eq(wxVariantData& data) const +{ + wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") ); + + wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data; + + return (otherData.m_value == m_value); } -void wxVariant::operator= (const wxStringList& value) + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataDateTime::Write(wxSTD ostream& str) const { - if (GetType() == "stringlist") - { - ((wxVariantDataStringList*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataStringList(value); - } + wxString value; + Write( value ); + str << value.c_str(); + return true; } +#endif -bool wxVariant::operator== (const wxList& value) const + +bool wxVariantDataDateTime::Write(wxString& str) const { - wxASSERT_MSG( (GetType() == "list"), "Invalid type for == operator" ); + str = m_value.Format(); + return true; +} - wxVariantDataList other(value); - return (m_data->Eq(other)); + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) +{ + // Not implemented + return false; } +#endif + -bool wxVariant::operator!= (const wxList& value) const +bool wxVariantDataDateTime::Read(wxString& str) { - return (!((*this) == value)); + if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/)) + return false; + return true; } -void wxVariant::operator= (const wxList& value) +// wxVariant + +wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date { - if (GetType() == "list") - { - ((wxVariantDataList*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataList(value); - } + m_data = new wxVariantDataDateTime(val); + m_name = name; } -#if wxUSE_TIMEDATE -bool wxVariant::operator== (const wxTime& value) const +bool wxVariant::operator== (const wxDateTime& value) const { - wxTime thisValue; + wxDateTime thisValue; if (!Convert(&thisValue)) - return FALSE; - else - return (value == thisValue); + return false; + + return value.IsEqualTo(thisValue); } -bool wxVariant::operator!= (const wxTime& value) const +bool wxVariant::operator!= (const wxDateTime& value) const { return (!((*this) == value)); } -void wxVariant::operator= (const wxTime& value) +void wxVariant::operator= (const wxDateTime& value) { - if (GetType() == "time") + if (GetType() == wxT("datetime") && + m_data->GetRefCount() == 1) { - ((wxVariantDataTime*)GetData())->SetValue(value); + ((wxVariantDataDateTime*)GetData())->SetValue(value); } else { - if (m_data) - delete m_data; - m_data = new wxVariantDataTime(value); + UnRef(); + m_data = new wxVariantDataDateTime(value); } } -bool wxVariant::operator== (const wxDate& value) const +wxDateTime wxVariant::GetDateTime() const { - wxDate thisValue; - if (!Convert(&thisValue)) - return FALSE; - else - return (value == thisValue); -} + wxDateTime value; + if (!Convert(& value)) + { + wxFAIL_MSG(wxT("Could not convert to a datetime")); + } -bool wxVariant::operator!= (const wxDate& value) const -{ - return (!((*this) == value)); + return value; } -void wxVariant::operator= (const wxDate& value) +#endif // wxUSE_DATETIME + +// ---------------------------------------------------------------------------- +// wxVariantDataArrayString +// ---------------------------------------------------------------------------- + +class wxVariantDataArrayString: public wxVariantData { - if (GetType() == "date") - { - ((wxVariantDataTime*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataDate(value); - } -} +public: + wxVariantDataArrayString() { } + wxVariantDataArrayString(const wxArrayString& value) { m_value = 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== (void* value) const +protected: + wxArrayString m_value; +}; + +bool wxVariantDataArrayString::Eq(wxVariantData& data) const { - return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") ); + + wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; + + 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) == value)); + // Not implemented + return false; } +#endif -void wxVariant::operator= (void* value) +bool wxVariantDataArrayString::Write(wxString& str) const { - if (GetType() == "void*") + size_t count = m_value.GetCount(); + for ( size_t n = 0; n < count; n++ ) { - ((wxVariantDataVoidPtr*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataVoidPtr(value); + if ( n ) + str += _T(';'); + + str += m_value[n]; } + + return true; } -// Treat a list variant as an array -wxVariant wxVariant::operator[] (size_t idx) const + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) { - wxASSERT_MSG( (GetType() == "list" || GetType() == "stringlist"), "Invalid type for array operator" ); + // Not implemented + return false; +} +#endif + - if (GetType() == "list") +bool wxVariantDataArrayString::Read(wxString& str) +{ + wxStringTokenizer tk(str, _T(";")); + while ( tk.HasMoreTokens() ) { - wxVariantDataList* data = (wxVariantDataList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), "Invalid index for array" ); - return * (wxVariant*) (data->GetValue().Nth(idx)->Data()); + m_value.Add(tk.GetNextToken()); } - else if (GetType() == "stringlist") - { - wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), "Invalid index for array" ); - wxVariant variant( wxString( (char*) (data->GetValue().Nth(idx)->Data()) )); - return variant; - } - return wxNullVariant; + return true; } -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. +// wxVariant - wxASSERT_MSG( (GetType() == "list"), "Invalid type for array operator" ); +wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings +{ + m_data = new wxVariantDataArrayString(val); + m_name = name; +} - wxVariantDataList* data = (wxVariantDataList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), "Invalid index for array" ); +bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const +{ + wxFAIL_MSG( _T("TODO") ); - return * (wxVariant*) (data->GetValue().Nth(idx)->Data()); + return false; } -// Return the number of elements in a list -int wxVariant::GetCount() const +bool wxVariant::operator!=(const wxArrayString& value) const { - wxASSERT_MSG( (GetType() == "list" || GetType() == "stringlist"), "Invalid type for GetCount()" ); + return !(*this == value); +} - if (GetType() == "list") +void wxVariant::operator=(const wxArrayString& value) +{ + if (GetType() == wxT("arrstring") && + m_data->GetRefCount() == 1) { - wxVariantDataList* data = (wxVariantDataList*) m_data; - return data->GetValue().Number(); + ((wxVariantDataArrayString *)GetData())->SetValue(value); } - else if (GetType() == "stringlist") + else { - wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; - return data->GetValue().Number(); + UnRef(); + m_data = new wxVariantDataArrayString(value); } - return 0; } -wxString wxVariant::MakeString() const +wxArrayString wxVariant::GetArrayString() const { - if (!IsNull()) - { - wxString str; - if (GetData()->Write(str)) - return str; - } - return wxString(""); + 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", "stringlist", "list", "double", "long" -wxString wxVariant::GetType() const -{ - if (IsNull()) - return wxString("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); } - -// Value accessors -double wxVariant::GetReal() const +wxVariantDataList::~wxVariantDataList() { - double value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG("Could not convert to a real number"); - return 0.0; - } + Clear(); } -long wxVariant::GetInteger() const +void wxVariantDataList::SetValue(const wxVariantList& value) { - long value; - if (Convert(& value)) - return value; - else + Clear(); + wxVariantList::compatibility_iterator node = value.GetFirst(); + while (node) { - wxFAIL_MSG("Could not convert to an integer"); - return 0; + wxVariant* var = node->GetData(); + m_value.Append(new wxVariant(*var)); + node = node->GetNext(); } } -char wxVariant::GetChar() const +void wxVariantDataList::Clear() { - char value; - if (Convert(& value)) - return value; - else + wxVariantList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - wxFAIL_MSG("Could not convert to a char"); - return 0; + wxVariant* var = node->GetData(); + delete var; + node = node->GetNext(); } + m_value.Clear(); } -bool wxVariant::GetBool() const +bool wxVariantDataList::Eq(wxVariantData& data) const { - bool 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("Could not convert to a bool"); - 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; } -wxString wxVariant::GetString() const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Write(wxSTD ostream& str) const { - wxString value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG("Could not convert to a string"); - return wxString(""); - } + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; } +#endif -#if wxUSE_TIMEDATE -wxTime wxVariant::GetTime() const +bool wxVariantDataList::Write(wxString& str) const { - wxTime value; - if (Convert(& value)) - return value; - else + str = wxEmptyString; + wxVariantList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - wxFAIL_MSG("Could not convert to a time"); - return wxTime(); + wxVariant* var = node->GetData(); + if (node != m_value.GetFirst()) + str += wxT(" "); + wxString str1; + str += var->MakeString(); + node = node->GetNext(); } + + return true; } -wxDate wxVariant::GetDate() const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) { - wxDate value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG("Could not convert to a date"); - return wxDate(); - } + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; } #endif -void* wxVariant::GetVoidPtr() const +bool wxVariantDataList::Read(wxString& WXUNUSED(str)) { - wxASSERT( (GetType() == "void*") ); + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; +} - return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); +// wxVariant + +wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants +{ + m_data = new wxVariantDataList(val); + m_name = name; +} + +bool wxVariant::operator== (const wxVariantList& value) const +{ + wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); + + wxVariantDataList other(value); + return (GetData()->Eq(other)); } -wxList& wxVariant::GetList() const +bool wxVariant::operator!= (const wxVariantList& value) const { - wxASSERT( (GetType() == "list") ); + return (!((*this) == value)); +} - return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); +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() == "stringlist") ); + wxASSERT( (GetType() == wxT("list")) ); + + return (wxVariantList&) ((wxVariantDataList*) m_data)->GetValue(); +} - return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); +// 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)); } @@ -1626,163 +1627,223 @@ 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)); } -// 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(); + wxVariantList& list = GetList(); - wxNode* node = list.First(); + wxVariantList::compatibility_iterator node = list.GetFirst(); while (node) { - wxVariant* other = (wxVariant*) node->Data(); + wxVariant* other = node->GetData(); if (value == *other) - return TRUE; - node = node->Next(); + return true; + node = node->GetNext(); } - return FALSE; + return false; } // Deletes the nth element of the list -bool wxVariant::Delete(int item) +bool wxVariant::Delete(size_t item) { - wxList& list = GetList(); + wxVariantList& list = GetList(); - wxASSERT_MSG( (item < list.Number()), "Invalid index to Delete" ); - wxNode* node = list.Nth(item); - wxVariant* variant = (wxVariant*) node->Data(); + wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") ); + wxVariantList::compatibility_iterator node = list.Item(item); + wxVariant* variant = node->GetData(); delete variant; - delete node; - return TRUE; + list.Erase(node); + return true; } // Clear list void wxVariant::ClearList() { - if (!IsNull() && (GetType() == "list")) + if (!IsNull() && (GetType() == wxT("list"))) { ((wxVariantDataList*) m_data)->Clear(); } else { - if (GetType() != "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 == "double") - *value = (long) (((wxVariantDataReal*)GetData())->GetValue()); - else if (type == "long") + if (type == wxT("double")) + *value = (long) (((wxVariantDoubleData*)GetData())->GetValue()); + else if (type == wxT("long")) *value = ((wxVariantDataLong*)GetData())->GetValue(); - else if (type == "bool") +#ifdef HAVE_BOOL + else if (type == wxT("bool")) *value = (long) (((wxVariantDataBool*)GetData())->GetValue()); - else if (type == "string") - *value = atol((const char*) ((wxVariantDataString*)GetData())->GetValue()); +#endif + else if (type == wxT("string")) + *value = wxAtol(((wxVariantDataString*)GetData())->GetValue()); else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(bool* value) const { wxString type(GetType()); - if (type == "double") - *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0); - else if (type == "long") + if (type == wxT("double")) + *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0); + else if (type == wxT("long")) *value = (((wxVariantDataLong*)GetData())->GetValue() != 0); - else if (type == "bool") +#ifdef HAVE_BOOL + else if (type == wxT("bool")) *value = ((wxVariantDataBool*)GetData())->GetValue(); - else if (type == "string") +#endif + else if (type == wxT("string")) { wxString val(((wxVariantDataString*)GetData())->GetValue()); val.MakeLower(); - if (val == "true" || val == "yes") - *value = TRUE; - else if (val == "false" || val == "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 { wxString type(GetType()); - if (type == "double") - *value = ((wxVariantDataReal*)GetData())->GetValue(); - else if (type == "long") + if (type == wxT("double")) + *value = ((wxVariantDoubleData*)GetData())->GetValue(); + else if (type == wxT("long")) *value = (double) (((wxVariantDataLong*)GetData())->GetValue()); - else if (type == "bool") +#ifdef HAVE_BOOL + else if (type == wxT("bool")) *value = (double) (((wxVariantDataBool*)GetData())->GetValue()); - else if (type == "string") - *value = (double) atof((const char*) ((wxVariantDataString*)GetData())->GetValue()); +#endif + else if (type == wxT("string")) + *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue()); else - return FALSE; + return false; - return TRUE; + return true; } -bool wxVariant::Convert(char* value) const +bool wxVariant::Convert(wxUniChar* value) const { wxString type(GetType()); - if (type == "char") + if (type == wxT("char")) *value = ((wxVariantDataChar*)GetData())->GetValue(); - else if (type == "long") + else if (type == wxT("long")) *value = (char) (((wxVariantDataLong*)GetData())->GetValue()); - else if (type == "bool") +#ifdef HAVE_BOOL + else if (type == wxT("bool")) *value = (char) (((wxVariantDataBool*)GetData())->GetValue()); +#endif else - return FALSE; + return false; - return TRUE; + return true; } -bool wxVariant::Convert(wxString* value) const +bool wxVariant::Convert(char* value) const { - *value = MakeString(); - return TRUE; + wxUniChar ch; + if ( !Convert(&ch) ) + return false; + *value = ch; + return true; } -#if wxUSE_TIMEDATE -bool wxVariant::Convert(wxTime* value) const +bool wxVariant::Convert(wchar_t* value) const { - wxString type(GetType()); - if (type == "time") - *value = ((wxVariantDataTime*)GetData())->GetValue(); - else if (type == "date") - *value = wxTime(((wxVariantDataDate*)GetData())->GetValue()); - else - return FALSE; + wxUniChar ch; + if ( !Convert(&ch) ) + return false; + *value = ch; + return true; +} - return TRUE; +bool wxVariant::Convert(wxString* value) const +{ + *value = MakeString(); + return true; } -bool wxVariant::Convert(wxDate* value) const +#if wxUSE_DATETIME +bool wxVariant::Convert(wxDateTime* value) const { wxString type(GetType()); - if (type == "date") - *value = ((wxVariantDataDate*)GetData())->GetValue(); - else - return FALSE; - - return TRUE; + if (type == wxT("datetime")) + { + *value = ((wxVariantDataDateTime*)GetData())->GetValue(); + return true; + } + // Fallback to string conversion + wxString val; + return Convert(&val) && + (value->ParseDateTime(val.c_str()/*FIXME-UTF8*/) || + value->ParseDate(val.c_str()/*FIXME-UTF8*/) || + value->ParseTime(val.c_str()/*FIXME-UTF8*/)); } -#endif - // wxUSE_TIMEDATE +#endif // wxUSE_DATETIME + +#endif // wxUSE_VARIANT