X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e6b478087cfbc8ce55775014ad187359a9ff878..c437b3f4e47b74715a2f2385d4862972babd7802:/src/common/variant.cpp diff --git a/src/common/variant.cpp b/src/common/variant.cpp index f30f580dbb..661a6190e5 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -53,7 +53,7 @@ wxVariant WXDLLIMPEXP_BASE wxNullVariant; #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxVariantList); +WX_DEFINE_LIST(wxVariantList) /* * wxVariant @@ -63,12 +63,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject) wxVariant::wxVariant() { - m_data = (wxVariantData*) NULL; + m_data = NULL; } bool wxVariant::IsNull() const { - return (m_data == (wxVariantData*) NULL); + return (m_data == NULL); } void wxVariant::MakeNull() @@ -84,7 +84,7 @@ void wxVariant::Clear() wxVariant::wxVariant(const wxVariant& variant) : wxObject() { - m_data = (wxVariantData*) NULL; + m_data = NULL; if (!variant.IsNull()) Ref(variant); @@ -122,6 +122,9 @@ bool wxVariant::operator== (const wxVariant& variant) const if (IsNull() || variant.IsNull()) return (IsNull() == variant.IsNull()); + if (GetType() != variant.GetType()) + return false; + return (GetData()->Eq(* variant.GetData())); } @@ -130,7 +133,6 @@ bool wxVariant::operator!= (const wxVariant& variant) const return (!(*this == variant)); } - wxString wxVariant::MakeString() const { if (!IsNull()) @@ -177,6 +179,30 @@ void wxVariant::UnRef() } } +bool wxVariant::Unshare() +{ + if ( m_data && m_data->GetRefCount() > 1 ) + { + // 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; +} + // Returns a string representing the type of the variant, // e.g. "string", "bool", "list", "double", "long" @@ -227,6 +253,8 @@ public: virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS + wxVariantData* Clone() const { return new wxVariantDataLong(m_value); } + virtual wxString GetType() const { return wxT("long"); } protected: @@ -377,6 +405,7 @@ public: #endif // wxUSE_STREAMS virtual wxString GetType() const { return wxT("double"); } + wxVariantData* Clone() const { return new wxVariantDoubleData(m_value); } protected: double m_value; }; @@ -488,8 +517,6 @@ double wxVariant::GetDouble() const // wxVariantBoolData // ----------------------------------------------------------------- -#ifdef HAVE_BOOL - class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData { public: @@ -514,6 +541,7 @@ public: #endif // wxUSE_STREAMS virtual wxString GetType() const { return wxT("bool"); } + wxVariantData* Clone() const { return new wxVariantDataBool(m_value); } protected: bool m_value; }; @@ -624,8 +652,6 @@ bool wxVariant::GetBool() const } } -#endif // HAVE_BOOL - // ----------------------------------------------------------------- // wxVariantDataChar // ----------------------------------------------------------------- @@ -651,6 +677,7 @@ public: 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: wxUniChar m_value; @@ -802,6 +829,7 @@ public: 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; @@ -880,13 +908,13 @@ wxVariant::wxVariant(const wxCStrData& val, const wxString& name) m_name = name; } -wxVariant::wxVariant(const wxCharBuffer& val, const wxString& name) +wxVariant::wxVariant(const wxScopedCharBuffer& val, const wxString& name) { m_data = new wxVariantDataString(wxString(val)); m_name = name; } -wxVariant::wxVariant(const wxWCharBuffer& val, const wxString& name) +wxVariant::wxVariant(const wxScopedWCharBuffer& val, const wxString& name) { m_data = new wxVariantDataString(wxString(val)); m_name = name; @@ -955,10 +983,10 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const ; - virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; } + virtual wxVariantData* Clone() const { return new wxVariantDataWxObjectPtr(m_value); } virtual wxClassInfo* GetValueClassInfo(); - + protected: wxObject* m_value; }; @@ -975,13 +1003,13 @@ bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const wxString wxVariantDataWxObjectPtr::GetType() const { wxString returnVal(wxT("wxObject*")); - + if (m_value) { returnVal = m_value->GetClassInfo()->GetClassName(); returnVal += wxT("*"); } - + return returnVal; } @@ -1006,7 +1034,7 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const bool wxVariantDataWxObjectPtr::Write(wxString& str) const { - str.Printf(wxT("%s(%p)"), GetType().c_str(), wx_static_cast(void*, m_value)); + str.Printf(wxT("%s(%p)"), GetType().c_str(), static_cast(m_value)); return true; } @@ -1076,7 +1104,7 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("void*"); } - virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } + virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); } protected: void* m_value; @@ -1154,7 +1182,11 @@ void wxVariant::operator= (void* value) void* wxVariant::GetVoidPtr() const { - wxASSERT( (GetType() == wxT("void*")) ); + // handling this specially is convenient when working with COM, see #9873 + if ( IsNull() ) + return NULL; + + wxASSERT( GetType() == wxT("void*") ); return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); } @@ -1170,15 +1202,6 @@ class wxVariantDataDateTime: public wxVariantData public: wxVariantDataDateTime() { } wxVariantDataDateTime(const wxDateTime& value) { m_value = value; } -#if wxUSE_ODBC - wxVariantDataDateTime(const TIME_STRUCT* valptr) - { m_value = wxDateTime(valptr->hour, valptr->minute, valptr->second); } - wxVariantDataDateTime(const DATE_STRUCT* valptr) - { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); } - wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr) - { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year, - valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); } -#endif //ODBC inline wxDateTime GetValue() const { return m_value; } inline void SetValue(const wxDateTime& value) { m_value = value; } @@ -1193,7 +1216,7 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("datetime"); } - virtual wxVariantData* Clone() { return new wxVariantDataDateTime; } + virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); } protected: wxDateTime m_value; @@ -1223,7 +1246,10 @@ bool wxVariantDataDateTime::Write(wxSTD ostream& str) const bool wxVariantDataDateTime::Write(wxString& str) const { - str = m_value.Format(); + if ( m_value.IsValid() ) + str = m_value.Format(); + else + str = wxS("Invalid"); return true; } @@ -1239,9 +1265,14 @@ bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) bool wxVariantDataDateTime::Read(wxString& str) { - if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/)) - return false; - return true; + if ( str == wxS("Invalid") ) + { + m_value = wxInvalidDateTime; + return true; + } + + wxString::const_iterator end; + return m_value.ParseDateTime(str, &end) && end == str.end(); } // wxVariant @@ -1252,26 +1283,6 @@ wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date m_name = name; } -#if wxUSE_ODBC -wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date -{ - m_data = new wxVariantDataDateTime(valptr); - m_name = name; -} - -wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date -{ - m_data = new wxVariantDataDateTime(valptr); - m_name = name; -} - -wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date -{ - m_data = new wxVariantDataDateTime(valptr); - m_name = name; -} -#endif // wxUSE_ODBC - bool wxVariant::operator== (const wxDateTime& value) const { wxDateTime thisValue; @@ -1300,27 +1311,6 @@ void wxVariant::operator= (const wxDateTime& value) } } -#if wxUSE_ODBC -void wxVariant::operator= (const DATE_STRUCT* value) -{ - UnRef(); - m_data = new wxVariantDataDateTime(value); -} - -void wxVariant::operator= (const TIME_STRUCT* value) -{ - UnRef(); - m_data = new wxVariantDataDateTime(value); -} - -void wxVariant::operator= (const TIMESTAMP_STRUCT* value) -{ - UnRef(); - m_data = new wxVariantDataDateTime(value); -} - -#endif // wxUSE_ODBC - wxDateTime wxVariant::GetDateTime() const { wxDateTime value; @@ -1357,7 +1347,7 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("arrstring"); } - virtual wxVariantData* Clone() { return new wxVariantDataArrayString; } + virtual wxVariantData* Clone() const { return new wxVariantDataArrayString(m_value); } protected: wxArrayString m_value; @@ -1465,11 +1455,11 @@ class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData { public: wxVariantDataList() {} - wxVariantDataList(const wxList& list); + wxVariantDataList(const wxVariantList& list); virtual ~wxVariantDataList(); - wxList& GetValue() { return m_value; } - void SetValue(const wxList& value) ; + wxVariantList& GetValue() { return m_value; } + void SetValue(const wxVariantList& value) ; virtual bool Eq(wxVariantData& data) const; #if wxUSE_STD_IOSTREAM @@ -1484,11 +1474,12 @@ public: void Clear(); + wxVariantData* Clone() const { return new wxVariantDataList(m_value); } protected: - wxList m_value; + wxVariantList m_value; }; -wxVariantDataList::wxVariantDataList(const wxList& list) +wxVariantDataList::wxVariantDataList(const wxVariantList& list) { SetValue(list); } @@ -1498,13 +1489,13 @@ wxVariantDataList::~wxVariantDataList() Clear(); } -void wxVariantDataList::SetValue(const wxList& value) +void wxVariantDataList::SetValue(const wxVariantList& value) { Clear(); - wxList::compatibility_iterator node = value.GetFirst(); + wxVariantList::compatibility_iterator node = value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->GetData(); + wxVariant* var = node->GetData(); m_value.Append(new wxVariant(*var)); node = node->GetNext(); } @@ -1512,10 +1503,10 @@ void wxVariantDataList::SetValue(const wxList& value) void wxVariantDataList::Clear() { - wxList::compatibility_iterator node = m_value.GetFirst(); + wxVariantList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->GetData(); + wxVariant* var = node->GetData(); delete var; node = node->GetNext(); } @@ -1527,12 +1518,12 @@ bool wxVariantDataList::Eq(wxVariantData& data) const 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(); + wxVariantList::compatibility_iterator node1 = m_value.GetFirst(); + wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst(); while (node1 && node2) { - wxVariant* var1 = (wxVariant*) node1->GetData(); - wxVariant* var2 = (wxVariant*) node2->GetData(); + wxVariant* var1 = node1->GetData(); + wxVariant* var2 = node2->GetData(); if ((*var1) != (*var2)) return false; node1 = node1->GetNext(); @@ -1555,10 +1546,10 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const bool wxVariantDataList::Write(wxString& str) const { str = wxEmptyString; - wxList::compatibility_iterator node = m_value.GetFirst(); + wxVariantList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->GetData(); + wxVariant* var = node->GetData(); if (node != m_value.GetFirst()) str += wxT(" "); wxString str1; @@ -1587,13 +1578,13 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str)) // wxVariant -wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants +wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants { m_data = new wxVariantDataList(val); m_name = name; } -bool wxVariant::operator== (const wxList& value) const +bool wxVariant::operator== (const wxVariantList& value) const { wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); @@ -1601,12 +1592,12 @@ bool wxVariant::operator== (const wxList& value) const return (GetData()->Eq(other)); } -bool wxVariant::operator!= (const wxList& value) const +bool wxVariant::operator!= (const wxVariantList& value) const { return (!((*this) == value)); } -void wxVariant::operator= (const wxList& value) +void wxVariant::operator= (const wxVariantList& value) { if (GetType() == wxT("list") && m_data->GetRefCount() == 1) @@ -1620,11 +1611,11 @@ void wxVariant::operator= (const wxList& value) } } -wxList& wxVariant::GetList() const +wxVariantList& wxVariant::GetList() const { wxASSERT( (GetType() == wxT("list")) ); - return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); + return (wxVariantList&) ((wxVariantDataList*) m_data)->GetValue(); } // Make empty list @@ -1636,7 +1627,7 @@ void wxVariant::NullList() // Append to list void wxVariant::Append(const wxVariant& value) { - wxList& list = GetList(); + wxVariantList& list = GetList(); list.Append(new wxVariant(value)); } @@ -1644,7 +1635,7 @@ void wxVariant::Append(const wxVariant& value) // Insert at front of list void wxVariant::Insert(const wxVariant& value) { - wxList& list = GetList(); + wxVariantList& list = GetList(); list.Insert(new wxVariant(value)); } @@ -1652,12 +1643,12 @@ void wxVariant::Insert(const wxVariant& value) // Returns true if the variant is a member of the list bool wxVariant::Member(const wxVariant& value) const { - wxList& list = GetList(); + wxVariantList& list = GetList(); - wxList::compatibility_iterator node = list.GetFirst(); + wxVariantList::compatibility_iterator node = list.GetFirst(); while (node) { - wxVariant* other = (wxVariant*) node->GetData(); + wxVariant* other = node->GetData(); if (value == *other) return true; node = node->GetNext(); @@ -1668,11 +1659,11 @@ bool wxVariant::Member(const wxVariant& value) const // Deletes the nth element of the list bool wxVariant::Delete(size_t item) { - wxList& list = GetList(); + wxVariantList& list = GetList(); wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") ); - wxList::compatibility_iterator node = list.Item(item); - wxVariant* variant = (wxVariant*) node->GetData(); + wxVariantList::compatibility_iterator node = list.Item(item); + wxVariant* variant = node->GetData(); delete variant; list.Erase(node); return true; @@ -1703,7 +1694,7 @@ wxVariant wxVariant::operator[] (size_t idx) const { wxVariantDataList* data = (wxVariantDataList*) m_data; wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") ); - return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); + return *(data->GetValue().Item(idx)->GetData()); } return wxNullVariant; } @@ -1718,7 +1709,7 @@ wxVariant& wxVariant::operator[] (size_t idx) wxVariantDataList* data = (wxVariantDataList*) m_data; wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") ); - return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); + return * (data->GetValue().Item(idx)->GetData()); } // Return the number of elements in a list @@ -1745,10 +1736,8 @@ bool wxVariant::Convert(long* value) const *value = (long) (((wxVariantDoubleData*)GetData())->GetValue()); else if (type == wxT("long")) *value = ((wxVariantDataLong*)GetData())->GetValue(); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = (long) (((wxVariantDataBool*)GetData())->GetValue()); -#endif else if (type == wxT("string")) *value = wxAtol(((wxVariantDataString*)GetData())->GetValue()); else @@ -1764,10 +1753,8 @@ bool wxVariant::Convert(bool* value) const *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0); else if (type == wxT("long")) *value = (((wxVariantDataLong*)GetData())->GetValue() != 0); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = ((wxVariantDataBool*)GetData())->GetValue(); -#endif else if (type == wxT("string")) { wxString val(((wxVariantDataString*)GetData())->GetValue()); @@ -1792,10 +1779,8 @@ bool wxVariant::Convert(double* value) const *value = ((wxVariantDoubleData*)GetData())->GetValue(); else if (type == wxT("long")) *value = (double) (((wxVariantDataLong*)GetData())->GetValue()); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = (double) (((wxVariantDataBool*)GetData())->GetValue()); -#endif else if (type == wxT("string")) *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue()); else @@ -1811,10 +1796,8 @@ bool wxVariant::Convert(wxUniChar* value) const *value = ((wxVariantDataChar*)GetData())->GetValue(); else if (type == wxT("long")) *value = (char) (((wxVariantDataLong*)GetData())->GetValue()); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = (char) (((wxVariantDataBool*)GetData())->GetValue()); -#endif else return false; @@ -1854,12 +1837,25 @@ bool wxVariant::Convert(wxDateTime* value) const *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*/)); + if ( !Convert(&val) ) + return false; + + // Try to parse this as either date and time, only date or only time + // checking that the entire string was parsed + wxString::const_iterator end; + if ( value->ParseDateTime(val, &end) && end == val.end() ) + return true; + + if ( value->ParseDate(val, &end) && end == val.end() ) + return true; + + if ( value->ParseTime(val, &end) && end == val.end() ) + return true; + + return false; } #endif // wxUSE_DATETIME