X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5dc103fd4afb197f48d6a87f67f6b82dd7f56fe..0b1cc7bffb94ebfb4bc988b9a7320b96ea0cfcda:/src/common/variant.cpp diff --git a/src/common/variant.cpp b/src/common/variant.cpp index a06ac80606..870938c773 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -52,268 +52,156 @@ IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject) wxVariant WXDLLIMPEXP_BASE wxNullVariant; + /* - * wxVariantDataList + * wxVariant */ -class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData -{ -DECLARE_DYNAMIC_CLASS(wxVariantDataList) -public: - wxVariantDataList() {} - wxVariantDataList(const wxList& list); - virtual ~wxVariantDataList(); - - wxList& GetValue() { return 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 = (wxVariantData*) NULL; } -wxVariantDataList::~wxVariantDataList() +bool wxVariant::IsNull() const { - Clear(); + return (m_data == (wxVariantData*) 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") ); + m_data = (wxVariantData*) NULL; - wxVariantDataList& listData = (wxVariantDataList&) data; + if (!variant.IsNull()) + Ref(variant); - 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_name = variant.m_name; } -bool wxVariantDataList::Eq(wxVariantData& data) const +wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data { - wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") ); - - 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_data = data; + m_name = name; } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataList::Write(wxSTD ostream& str) const +wxVariant::~wxVariant() { - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; + UnRef(); } -#endif -bool wxVariantDataList::Write(wxString& str) const +// Assignment +void wxVariant::operator= (const wxVariant& variant) { - 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; + Ref(variant); + m_name = variant.m_name; } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) +// myVariant = new wxStringVariantData("hello") +void wxVariant::operator= (wxVariantData* variantData) { - wxFAIL_MSG(wxT("Unimplemented")); - // TODO - return false; + UnRef(); + m_data = variantData; } -#endif -bool wxVariantDataList::Read(wxString& WXUNUSED(str)) +bool wxVariant::operator== (const wxVariant& variant) const { - wxFAIL_MSG(wxT("Unimplemented")); - // TODO - return false; -} -#if WXWIN_COMPATIBILITY_2_4 + if (IsNull() || variant.IsNull()) + return (IsNull() == variant.IsNull()); -/* - * wxVariantDataStringList - */ + return (GetData()->Eq(* variant.GetData())); +} -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"); }; - -protected: - wxStringList m_value; -}; + return (!(*this == variant)); +} -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataStringList, wxVariantData) -void wxVariantDataStringList::SetValue(const wxStringList& value) +wxString wxVariant::MakeString() const { - m_value = value; + if (!IsNull()) + { + wxString str; + if (GetData()->Write(str)) + return str; + } + return wxEmptyString; } -void wxVariantDataStringList::Copy(wxVariantData& data) +void wxVariant::SetData(wxVariantData* data) { - wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Copy: Can't copy to this type of data") ); - - wxVariantDataStringList& listData = (wxVariantDataStringList&) data; - - listData.m_value = m_value ; + 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 -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; -} -#endif -bool wxVariantDataStringList::Write(wxString& str) const +void wxVariant::UnRef() { - str.Empty(); - wxStringList::compatibility_iterator node = m_value.GetFirst(); - while (node) + if ( m_data ) { - const wxChar* s = node->GetData(); - if (node != m_value.GetFirst()) - str += wxT(" "); - str += s; - node = node->GetNext(); + wxASSERT_MSG( m_data->m_count > 0, _T("invalid ref data count") ); + + m_data->DecRef(); + m_data = NULL; } +} - 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 { @@ -325,7 +213,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); @@ -347,15 +234,6 @@ protected: 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") ); @@ -412,21 +290,80 @@ bool wxVariantDataLong::Read(wxString& 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; } + m_data = new wxVariantDataLong(val); + m_name = name; +} - inline double GetValue() const { return m_value; } - inline void SetValue(double value) { m_value = value; } +wxVariant::wxVariant(int val, const wxString& name) +{ + m_data = new wxVariantDataLong((long)val); + m_name = name; +} + +wxVariant::wxVariant(short val, const wxString& name) +{ + m_data = new wxVariantDataLong((long)val); + m_name = name; +} + +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 +{ +DECLARE_DYNAMIC_CLASS(wxVariantDoubleData) +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 void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; virtual bool Read(wxString& str); #if wxUSE_STD_IOSTREAM @@ -446,28 +383,19 @@ protected: double m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData) - -void wxVariantDataReal::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Copy: Can't copy to this type of data") ); - - wxVariantDataReal& otherData = (wxVariantDataReal&) data; +IMPLEMENT_DYNAMIC_CLASS(wxVariantDoubleData, wxVariantData) - otherData.m_value = m_value; -} - -bool wxVariantDataReal::Eq(wxVariantData& data) const +bool wxVariantDoubleData::Eq(wxVariantData& data) const { - wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Eq: argument mismatch") ); + wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") ); - wxVariantDataReal& otherData = (wxVariantDataReal&) data; + wxVariantDoubleData& otherData = (wxVariantDoubleData&) data; return wxIsSameDouble(otherData.m_value, m_value); } #if wxUSE_STD_IOSTREAM -bool wxVariantDataReal::Write(wxSTD ostream& str) const +bool wxVariantDoubleData::Write(wxSTD ostream& str) const { wxString s; Write(s); @@ -476,14 +404,14 @@ bool wxVariantDataReal::Write(wxSTD ostream& str) const } #endif -bool wxVariantDataReal::Write(wxString& str) const +bool wxVariantDoubleData::Write(wxString& str) const { 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; @@ -491,14 +419,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(); @@ -506,16 +434,65 @@ bool wxVariantDataReal::Read(wxInputStream& str) } #endif // wxUSE_STREAMS -bool wxVariantDataReal::Read(wxString& str) +bool wxVariantDoubleData::Read(wxString& str) { m_value = wxAtof((const wxChar*) str); return true; } +// 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 +// ----------------------------------------------------------------- + #ifdef HAVE_BOOL -/* - * wxVariantDataBool - */ class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData { @@ -527,7 +504,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; @@ -549,15 +525,6 @@ protected: 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") ); @@ -615,23 +582,71 @@ bool wxVariantDataBool::Read(wxString& str) m_value = (wxAtol((const wxChar*) str) != 0); return true; } + +// 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; + } +} + #endif // HAVE_BOOL -/* - * wxVariantDataChar - */ +// ----------------------------------------------------------------- +// wxVariantDataChar +// ----------------------------------------------------------------- class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataChar) public: wxVariantDataChar() { m_value = 0; } - wxVariantDataChar(char value) { m_value = value; } + wxVariantDataChar(wxChar value) { m_value = value; } - inline char GetValue() const { return m_value; } - inline void SetValue(char value) { m_value = value; } + inline wxChar GetValue() const { return m_value; } + inline void SetValue(wxChar 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); @@ -646,20 +661,11 @@ public: virtual wxString GetType() const { return wxT("char"); }; protected: - char m_value; + wxChar 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") ); @@ -689,7 +695,7 @@ bool wxVariantDataChar::Write(wxString& str) const bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); -// str >> m_value; + return false; } #endif @@ -699,7 +705,8 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const { wxTextOutputStream s(str); - s.Write8(m_value); + s << m_value; + return true; } @@ -707,20 +714,67 @@ bool wxVariantDataChar::Read(wxInputStream& str) { wxTextInputStream s(str); - m_value = s.Read8(); + s >> m_value; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataChar::Read(wxString& str) { - m_value = str.ToAscii()[size_t(0)]; + m_value = str[size_t(0)]; return true; } -/* - * wxVariantDataString - */ +wxVariant::wxVariant(wxChar val, const wxString& name) +{ + m_data = new wxVariantDataChar(val); + m_name = name; +} + +bool wxVariant::operator== (wxChar value) const +{ + wxChar thisValue; + if (!Convert(&thisValue)) + return false; + else + return (value == thisValue); +} + +bool wxVariant::operator!= (wxChar value) const +{ + return (!((*this) == value)); +} + +void wxVariant::operator= (wxChar value) +{ + if (GetType() == wxT("char") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataChar*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataChar(value); + } +} + +wxChar wxVariant::GetChar() const +{ + wxChar value; + if (Convert(& value)) + return value; + else + { + wxFAIL_MSG(wxT("Could not convert to a char")); + return 0; + } +} + +// ---------------------------------------------------------------------------- +// wxVariantDataString +// ---------------------------------------------------------------------------- class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData { @@ -732,7 +786,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; @@ -752,15 +805,6 @@ 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") ); @@ -810,92 +854,76 @@ bool wxVariantDataString::Read(wxString& str) IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) -/* - * wxVariantDataVoidPtr - */ +// wxVariant **** -class wxVariantDataVoidPtr: public wxVariantData +wxVariant::wxVariant(const wxString& val, const wxString& name) { -DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr) -public: - wxVariantDataVoidPtr() { } - wxVariantDataVoidPtr(void* 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; -#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) + m_data = new wxVariantDataString(val); + m_name = name; +} -void wxVariantDataVoidPtr::Copy(wxVariantData& data) +wxVariant::wxVariant(const wxChar* 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(wxString(val)); + m_name = name; } -bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const +bool wxVariant::operator== (const wxString& value) const { - wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") ); - - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; + wxString thisValue; + if (!Convert(&thisValue)) + return false; - return (otherData.m_value == m_value); + return value == thisValue; } -#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; + return (!((*this) == value)); } -#endif -bool wxVariantDataVoidPtr::Write(wxString& str) const +void wxVariant::operator= (const wxString& value) { - str.Printf(wxT("%p"), m_value); - return true; + if (GetType() == wxT("string") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataString*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataString(value); + } } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) +void wxVariant::operator= (const wxChar* value) { - // Not implemented - return false; + if (GetType() == wxT("string") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataString*)GetData())->SetValue(wxString(value)); + } + else + { + UnRef(); + m_data = new wxVariantDataString(wxString(value)); + } } -#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 { @@ -907,7 +935,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; @@ -929,17 +956,6 @@ protected: 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") ); @@ -997,34 +1013,50 @@ 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 +{ + wxASSERT(wxIsKindOf(GetData(), wxVariantDataWxObjectPtr)); + return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); +} + +// ---------------------------------------------------------------------------- +// wxVariantDataVoidPtr +// ---------------------------------------------------------------------------- +class wxVariantDataVoidPtr: public wxVariantData +{ +DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr) 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; @@ -1034,84 +1066,121 @@ 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() { return new wxVariantDataVoidPtr; } protected: - wxDateTime m_value; -}; + void* m_value; + DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr) +}; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData) +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, 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& WXUNUSED(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; } -#endif +bool wxVariant::operator== (void* value) const +{ + return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); +} -bool wxVariantDataDateTime::Read(wxString& str) +bool wxVariant::operator!= (void* value) const { - if(! m_value.ParseDateTime(str)) - return false; - return true; + return (!((*this) == (void*) value)); } -#endif // wxUSE_DATETIME +void wxVariant::operator= (void* value) +{ + if (GetType() == wxT("void*") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataVoidPtr*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataVoidPtr(value); + } +} + +void* wxVariant::GetVoidPtr() const +{ + wxASSERT( (GetType() == wxT("void*")) ); + + return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); +} // ---------------------------------------------------------------------------- -// wxVariantDataArrayString +// wxVariantDataDateTime // ---------------------------------------------------------------------------- -class wxVariantDataArrayString: public wxVariantData +#if wxUSE_DATETIME + +class wxVariantDataDateTime: public wxVariantData { + DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime) + public: - wxVariantDataArrayString() { } - wxVariantDataArrayString(const wxArrayString& value) { m_value = value; } + 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 - 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; @@ -1121,63 +1190,46 @@ 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() { return new wxVariantDataDateTime; } 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; -} +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData) -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& WXUNUSED(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]; - } - + str = m_value.Format(); return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) +bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented return false; @@ -1185,104 +1237,20 @@ 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() ) - { - m_value.Add(tk.GetNextToken()); - } - + if(! m_value.ParseDateTime(str)) + return false; return true; } +// wxVariant - -/* - * wxVariant - */ - -IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject) - -// Construction & destruction -wxVariant::wxVariant() -{ - m_data = (wxVariantData*) NULL; -} - -wxVariant::wxVariant(double val, const wxString& name) -{ - 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 @@ -1304,285 +1272,340 @@ wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date } #endif // wxUSE_ODBC -wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings +bool wxVariant::operator== (const wxDateTime& value) const { - m_data = new wxVariantDataArrayString(val); - m_name = name; + wxDateTime thisValue; + if (!Convert(&thisValue)) + return false; + + return value.IsEqualTo(thisValue); } -wxVariant::wxVariant(const wxVariant& variant) - : wxObject() +bool wxVariant::operator!= (const wxDateTime& value) const { - if (!variant.IsNull()) + return (!((*this) == value)); +} + +void wxVariant::operator= (const wxDateTime& value) +{ + if (GetType() == wxT("datetime") && + m_data->GetRefCount() == 1) { - m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject(); - variant.m_data->Copy(*m_data); + ((wxVariantDataDateTime*)GetData())->SetValue(value); } else - m_data = (wxVariantData*) NULL; - m_name = variant.m_name; + { + UnRef(); + m_data = new wxVariantDataDateTime(value); + } } -wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data +#if wxUSE_ODBC +void wxVariant::operator= (const DATE_STRUCT* value) { - m_data = data; - m_name = name; + UnRef(); + m_data = new wxVariantDataDateTime(value); } -wxVariant::~wxVariant() +void wxVariant::operator= (const TIME_STRUCT* value) { - delete m_data; + UnRef(); + m_data = new wxVariantDataDateTime(value); } - -// Make NULL (i.e. delete the data) -void wxVariant::MakeNull() +void wxVariant::operator= (const TIMESTAMP_STRUCT* value) { - delete m_data; - m_data = NULL; + UnRef(); + m_data = new wxVariantDataDateTime(value); } -// Generic operators -// Assignment -void wxVariant::operator= (const wxVariant& variant) +#endif // wxUSE_ODBC + +wxDateTime wxVariant::GetDateTime() const { - if (variant.IsNull()) + wxDateTime value; + if (!Convert(& value)) { - MakeNull(); - return; + wxFAIL_MSG(wxT("Could not convert to a datetime")); } - if (IsNull() || (GetType() != variant.GetType())) - { - if (m_data) - delete m_data; - m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject(); - } + return value; +} - variant.GetData()->Copy(* GetData()); +#endif // wxUSE_DATETIME - m_name = variant.m_name; -} +// ---------------------------------------------------------------------------- +// wxVariantDataArrayString +// ---------------------------------------------------------------------------- -// Assignment using data, e.g. -// myVariant = new wxStringVariantData("hello") -void wxVariant::operator= (wxVariantData* variantData) +class wxVariantDataArrayString: public wxVariantData { - MakeNull(); - m_data = variantData; -} +public: + wxVariantDataArrayString() { } + wxVariantDataArrayString(const wxArrayString& value) { m_value = value; } -bool wxVariant::operator== (const wxVariant& variant) const -{ - if (IsNull() || variant.IsNull()) - return (IsNull() == variant.IsNull()); + wxArrayString GetValue() const { return m_value; } + void SetValue(const wxArrayString& value) { m_value = value; } - return (GetData()->Eq(* variant.GetData())); -} + virtual bool Eq(wxVariantData& data) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif + virtual bool Write(wxString& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif + virtual bool Read(wxString& str); + virtual wxString GetType() const { return wxT("arrstring"); }; + virtual wxVariantData* Clone() { return new wxVariantDataArrayString; } -bool wxVariant::operator!= (const wxVariant& variant) const -{ - return (!(*this == variant)); -} +protected: + wxArrayString m_value; + + DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString) +}; +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData) -// Specific operators -bool wxVariant::operator== (double value) const +bool wxVariantDataArrayString::Eq(wxVariantData& data) const { - double thisValue; - if (!Convert(&thisValue)) - return false; + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") ); - return wxIsSameDouble(value, thisValue); + wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; + + return otherData.m_value == m_value; } -bool wxVariant::operator!= (double 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= (double value) +bool wxVariantDataArrayString::Write(wxString& str) const { - if (GetType() == wxT("double")) - { - ((wxVariantDataReal*)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 wxVariantDataReal(value); + if ( n ) + str += _T(';'); + + str += m_value[n]; } -} -bool wxVariant::operator== (long value) const -{ - long thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); + return true; } -bool wxVariant::operator!= (long value) const + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) { - return (!((*this) == value)); + // Not implemented + return false; } +#endif -void wxVariant::operator= (long value) + +bool wxVariantDataArrayString::Read(wxString& str) { - if (GetType() == wxT("long")) - { - ((wxVariantDataLong*)GetData())->SetValue(value); - } - else + wxStringTokenizer tk(str, _T(";")); + while ( tk.HasMoreTokens() ) { - if (m_data) - delete m_data; - m_data = new wxVariantDataLong(value); + m_value.Add(tk.GetNextToken()); } + + return true; } -bool wxVariant::operator== (char value) const +// wxVariant + +wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings { - char thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); + m_data = new wxVariantDataArrayString(val); + m_name = name; } -bool wxVariant::operator!= (char value) const +bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const { - return (!((*this) == value)); + wxFAIL_MSG( _T("TODO") ); + + return false; +} + +bool wxVariant::operator!=(const wxArrayString& value) const +{ + return !(*this == value); } -void wxVariant::operator= (char value) +void wxVariant::operator=(const wxArrayString& value) { - if (GetType() == wxT("char")) + if (GetType() == wxT("arrstring") && + m_data->GetRefCount() == 1) { - ((wxVariantDataChar*)GetData())->SetValue(value); + ((wxVariantDataArrayString *)GetData())->SetValue(value); } else { - if (m_data) - delete m_data; - m_data = new wxVariantDataChar(value); + UnRef(); + m_data = new wxVariantDataArrayString(value); } } -#ifdef HAVE_BOOL -bool wxVariant::operator== (bool value) const +wxArrayString wxVariant::GetArrayString() const { - bool thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); -} + if ( GetType() == wxT("arrstring") ) + return ((wxVariantDataArrayString *)GetData())->GetValue(); -bool wxVariant::operator!= (bool value) const -{ - return (!((*this) == value)); + return wxArrayString(); } -void wxVariant::operator= (bool value) -{ - if (GetType() == wxT("bool")) - { - ((wxVariantDataBool*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataBool(value); - } -} -#endif // HAVE_BOOL +// ---------------------------------------------------------------------------- +// wxVariantDataList +// ---------------------------------------------------------------------------- -bool wxVariant::operator== (const wxString& value) const +class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData { - wxString thisValue; - if (!Convert(&thisValue)) - return false; +DECLARE_DYNAMIC_CLASS(wxVariantDataList) +public: + wxVariantDataList() {} + wxVariantDataList(const wxList& list); + virtual ~wxVariantDataList(); - return value == thisValue; + wxList& GetValue() { return m_value; } + void SetValue(const wxList& 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("list"); }; + + void Clear(); + +protected: + wxList m_value; +}; + +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData) + +wxVariantDataList::wxVariantDataList(const wxList& list) +{ + SetValue(list); } -bool wxVariant::operator!= (const wxString& value) const +wxVariantDataList::~wxVariantDataList() { - return (!((*this) == value)); + Clear(); } -void wxVariant::operator= (const wxString& value) +void wxVariantDataList::SetValue(const wxList& value) { - if (GetType() == wxT("string")) - { - ((wxVariantDataString*)GetData())->SetValue(value); - } - else + Clear(); + wxList::compatibility_iterator node = value.GetFirst(); + while (node) { - if (m_data) - delete m_data; - m_data = new wxVariantDataString(value); + wxVariant* var = (wxVariant*) node->GetData(); + m_value.Append(new wxVariant(*var)); + node = node->GetNext(); } } -void wxVariant::operator= (const wxChar* value) +void wxVariantDataList::Clear() { - if (GetType() == wxT("string")) - { - ((wxVariantDataString*)GetData())->SetValue(wxString(value)); - } - else + wxList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - if (m_data) - delete m_data; - m_data = new wxVariantDataString(wxString(value)); + wxVariant* var = (wxVariant*) node->GetData(); + delete var; + node = node->GetNext(); } + m_value.Clear(); } -#if WXWIN_COMPATIBILITY_2_4 - -bool wxVariant::operator== (const wxStringList& value) const +bool wxVariantDataList::Eq(wxVariantData& data) const { - wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); + wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") ); - wxVariantDataStringList other(value); - return (m_data->Eq(other)); + 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; } -bool wxVariant::operator!= (const wxStringList& value) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Write(wxSTD ostream& str) const { - wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); - - wxVariantDataStringList other(value); - return !(m_data->Eq(other)); + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; } +#endif -void wxVariant::operator= (const wxStringList& value) +bool wxVariantDataList::Write(wxString& str) const { - if (GetType() == wxT("stringlist")) - { - ((wxVariantDataStringList*)GetData())->SetValue(value); - } - else + str = wxEmptyString; + wxList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - if (m_data) - delete m_data; - m_data = new wxVariantDataStringList(value); + wxVariant* var = (wxVariant*) node->GetData(); + if (node != m_value.GetFirst()) + str += wxT(" "); + wxString str1; + str += var->MakeString(); + node = node->GetNext(); } + + return true; } +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) +{ + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; +} #endif +bool wxVariantDataList::Read(wxString& WXUNUSED(str)) +{ + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; +} + +// wxVariant + +wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants +{ + m_data = new wxVariantDataList(val); + m_name = name; +} + 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)); + return (GetData()->Eq(other)); } bool wxVariant::operator!= (const wxList& value) const @@ -1592,131 +1615,242 @@ bool wxVariant::operator!= (const wxList& value) const void wxVariant::operator= (const wxList& value) { - if (GetType() == wxT("list")) + if (GetType() == wxT("list") && + m_data->GetRefCount() == 1) { ((wxVariantDataList*)GetData())->SetValue(value); } else { - if (m_data) - delete m_data; + UnRef(); m_data = new wxVariantDataList(value); } } -bool wxVariant::operator== (void* value) const +wxList& wxVariant::GetList() const { - return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); + wxASSERT( (GetType() == wxT("list")) ); + + return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); } -bool wxVariant::operator!= (void* value) const +// Make empty list +void wxVariant::NullList() { - return (!((*this) == (void*) value)); + SetData(new wxVariantDataList()); } -void wxVariant::operator= (void* value) +// Append to list +void wxVariant::Append(const wxVariant& value) { - if (GetType() == wxT("void*")) + wxList& list = GetList(); + + list.Append(new wxVariant(value)); +} + +// Insert at front of list +void wxVariant::Insert(const wxVariant& value) +{ + wxList& list = GetList(); + + list.Insert(new wxVariant(value)); +} + +// Returns true if the variant is a member of the list +bool wxVariant::Member(const wxVariant& value) const +{ + wxList& list = GetList(); + + wxList::compatibility_iterator node = list.GetFirst(); + while (node) { - ((wxVariantDataVoidPtr*)GetData())->SetValue(value); + wxVariant* other = (wxVariant*) node->GetData(); + if (value == *other) + return true; + node = node->GetNext(); + } + return false; +} + +// Deletes the nth element of the list +bool wxVariant::Delete(size_t item) +{ + wxList& list = GetList(); + + wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") ); + wxList::compatibility_iterator node = list.Item(item); + wxVariant* variant = (wxVariant*) node->GetData(); + delete variant; + list.Erase(node); + return true; +} + +// Clear list +void wxVariant::ClearList() +{ + if (!IsNull() && (GetType() == wxT("list"))) + { + ((wxVariantDataList*) m_data)->Clear(); } else { - if (m_data) - delete m_data; - m_data = new wxVariantDataVoidPtr(value); + if (!GetType().IsSameAs(wxT("list"))) + UnRef(); + + m_data = new wxVariantDataList; } } -#if wxUSE_DATETIME -bool wxVariant::operator== (const wxDateTime& value) const +#if WXWIN_COMPATIBILITY_2_4 + +// ---------------------------------------------------------------------------- +// wxVariantDataStringList +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData { - wxDateTime thisValue; - if (!Convert(&thisValue)) - return false; +DECLARE_DYNAMIC_CLASS(wxVariantDataStringList) +public: + wxVariantDataStringList() {} + wxVariantDataStringList(const wxStringList& list) { m_value = list; } - return value.IsEqualTo(thisValue); -} + wxStringList& GetValue() const { return (wxStringList&) m_value; } + void SetValue(const wxStringList& value); -bool wxVariant::operator!= (const wxDateTime& value) const + 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"); }; + +protected: + wxStringList m_value; +}; + +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataStringList, wxVariantData) + +void wxVariantDataStringList::SetValue(const wxStringList& value) { - return (!((*this) == value)); + m_value = value; } -void wxVariant::operator= (const wxDateTime& value) +bool wxVariantDataStringList::Eq(wxVariantData& data) const { - if (GetType() == wxT("datetime")) + wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") ); + + wxVariantDataStringList& listData = (wxVariantDataStringList&) data; + wxStringList::compatibility_iterator node1 = m_value.GetFirst(); + wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst(); + while (node1 && node2) { - ((wxVariantDataDateTime*)GetData())->SetValue(value); + wxString str1 ( node1->GetData() ); + wxString str2 ( node2->GetData() ); + if (str1 != str2) + return false; + node1 = node1->GetNext(); + node2 = node2->GetNext(); } - else + if (node1 || node2) return false; + return true; +} + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataStringList::Write(wxSTD ostream& str) const +{ + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; +} +#endif + +bool wxVariantDataStringList::Write(wxString& str) const +{ + str.Empty(); + wxStringList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); + const wxChar* s = node->GetData(); + if (node != m_value.GetFirst()) + str += wxT(" "); + str += s; + node = node->GetNext(); } + + return true; } -#endif // wxUSE_DATETIME -#if wxUSE_ODBC -void wxVariant::operator= (const DATE_STRUCT* value) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str)) { - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; } +#endif - -void wxVariant::operator= (const TIME_STRUCT* value) +bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) { - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; } +#endif //2.4 compat -void wxVariant::operator= (const TIMESTAMP_STRUCT* value) +#if WXWIN_COMPATIBILITY_2_4 + +wxVariant::wxVariant(const wxStringList& val, const wxString& name) { - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); + m_data = new wxVariantDataStringList(val); + m_name = name; } -#endif // wxUSE_ODBC - -bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const +bool wxVariant::operator== (const wxStringList& value) const { - wxFAIL_MSG( _T("TODO") ); + wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); - return false; + wxVariantDataStringList other(value); + return (GetData()->Eq(other)); } -bool wxVariant::operator!=(const wxArrayString& value) const +bool wxVariant::operator!= (const wxStringList& value) const { - return !(*this == value); + wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); + + wxVariantDataStringList other(value); + return !(GetData()->Eq(other)); } -void wxVariant::operator=(const wxArrayString& value) +void wxVariant::operator= (const wxStringList& value) { - if (GetType() == wxT("arrstring")) + if (GetType() == wxT("stringlist") && + m_data->GetRefCount() == 1) { - ((wxVariantDataArrayString *)GetData())->SetValue(value); + ((wxVariantDataStringList*)GetData())->SetValue(value); } else { - delete m_data; - m_data = new wxVariantDataArrayString(value); + UnRef(); + m_data = new wxVariantDataStringList(value); } } -wxArrayString wxVariant::GetArrayString() const +// wxVariant + +wxStringList& wxVariant::GetStringList() const { - if ( GetType() == wxT("arrstring") ) - return ((wxVariantDataArrayString *)GetData())->GetValue(); + wxASSERT( (GetType() == wxT("stringlist")) ); - return wxArrayString(); + return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); } +#endif // Treat a list variant as an array wxVariant wxVariant::operator[] (size_t idx) const @@ -1784,228 +1918,15 @@ size_t wxVariant::GetCount() const return 0; } -wxString wxVariant::MakeString() const -{ - if (!IsNull()) - { - wxString str; - if (GetData()->Write(str)) - return str; - } - return wxEmptyString; -} - -// Accessors - -void wxVariant::SetData(wxVariantData* data) -{ - if (m_data) delete m_data; - m_data = data; -} - - -// 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(); -} - - -bool wxVariant::IsType(const wxString& type) const -{ - return (GetType() == type); -} - -bool wxVariant::IsValueKindOf(const wxClassInfo* type) const -{ - wxClassInfo* info=m_data->GetValueClassInfo(); - return info ? info->IsKindOf(type) : false ; -} - - -// Value accessors -double wxVariant::GetReal() const -{ - double value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a real number")); - return 0.0; - } -} - -long wxVariant::GetInteger() const -{ - long value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to an integer")); - return 0; - } -} - -char wxVariant::GetChar() const -{ - char value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a char")); - return 0; - } -} - -bool wxVariant::GetBool() const -{ - bool value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a bool")); - return 0; - } -} - -wxString wxVariant::GetString() const -{ - wxString value; - if (!Convert(& value)) - { - wxFAIL_MSG(wxT("Could not convert to a string")); - } - - return value; -} - -void* wxVariant::GetVoidPtr() const -{ - wxASSERT( (GetType() == wxT("void*")) ); - - return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); -} - -wxObject* wxVariant::GetWxObjectPtr() -{ - wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr)); - return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); -} - -#if wxUSE_DATETIME -wxDateTime wxVariant::GetDateTime() const -{ - wxDateTime value; - if (!Convert(& value)) - { - wxFAIL_MSG(wxT("Could not convert to a datetime")); - } - - return value; -} -#endif // wxUSE_DATETIME - -wxList& wxVariant::GetList() const -{ - wxASSERT( (GetType() == wxT("list")) ); - - return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); -} - -#if WXWIN_COMPATIBILITY_2_4 - -wxStringList& wxVariant::GetStringList() const -{ - wxASSERT( (GetType() == wxT("stringlist")) ); - - return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); -} - -#endif - -// Make empty list -void wxVariant::NullList() -{ - SetData(new wxVariantDataList()); -} - -// Append to list -void wxVariant::Append(const wxVariant& value) -{ - wxList& list = GetList(); - - list.Append(new wxVariant(value)); -} - -// Insert at front of list -void wxVariant::Insert(const wxVariant& value) -{ - wxList& list = GetList(); - - list.Insert(new wxVariant(value)); -} - -// Returns true if the variant is a member of the list -bool wxVariant::Member(const wxVariant& value) const -{ - wxList& list = GetList(); - - wxList::compatibility_iterator node = list.GetFirst(); - while (node) - { - wxVariant* other = (wxVariant*) node->GetData(); - if (value == *other) - return true; - node = node->GetNext(); - } - return false; -} - -// Deletes the nth element of the list -bool wxVariant::Delete(size_t item) -{ - wxList& list = GetList(); - - wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") ); - wxList::compatibility_iterator node = list.Item(item); - wxVariant* variant = (wxVariant*) node->GetData(); - delete variant; - list.Erase(node); - return true; -} - -// Clear list -void wxVariant::ClearList() -{ - if (!IsNull() && (GetType() == wxT("list"))) - { - ((wxVariantDataList*) m_data)->Clear(); - } - else - { - if (!GetType().IsSameAs(wxT("list"))) - { - delete m_data; - m_data = NULL; - } - m_data = new wxVariantDataList; - } -} - +// ---------------------------------------------------------------------------- // 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 @@ -2024,7 +1945,7 @@ 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 @@ -2052,7 +1973,7 @@ 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 @@ -2067,7 +1988,7 @@ bool wxVariant::Convert(double* value) const return true; } -bool wxVariant::Convert(char* value) const +bool wxVariant::Convert(wxChar* value) const { wxString type(GetType()); if (type == wxT("char"))