From 2c3a10641d965a0fdc9834258e27ce927842c2a0 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Mon, 7 Feb 2005 22:51:30 +0000 Subject: [PATCH] depereciate stringlist stuff in wxVariant git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/variant.h | 17 +++++++++++------ src/common/variant.cpp | 29 ++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/include/wx/variant.h b/include/wx/variant.h index 3d3ad32484..527d082630 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -95,7 +95,9 @@ public: wxVariant(char val, const wxString& name = wxEmptyString); wxVariant(const wxString& val, const wxString& name = wxEmptyString); wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool! - wxVariant(const wxStringList& val, const wxString& name = wxEmptyString); +#if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( wxVariant(const wxStringList& val, const wxString& name = wxEmptyString) ); +#endif wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose) wxVariant(wxObject* ptr, const wxString& name = wxEmptyString); //wxObject @@ -157,9 +159,11 @@ public: bool operator!= (const wxString& value) const; void operator= (const wxString& value) ; void operator= (const wxChar* value) ; // Necessary or VC++ assumes bool! - bool operator== (const wxStringList& value) const; - bool operator!= (const wxStringList& value) const; - void operator= (const wxStringList& value) ; +#if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( bool operator== (const wxStringList& value) const ); + wxDEPRECATED( bool operator!= (const wxStringList& value) const ); + wxDEPRECATED( void operator= (const wxStringList& value) ); +#endif bool operator== (const wxList& value) const; bool operator!= (const wxList& value) const; void operator= (const wxList& value) ; @@ -218,8 +222,9 @@ public: bool GetBool() const ; wxString GetString() const ; wxList& GetList() const ; - wxStringList& GetStringList() const ; - +#if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( wxStringList& GetStringList() const ); +#endif void* GetVoidPtr() const ; wxObject* GetWxObjectPtr() ; #if wxUSE_DATETIME diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 830859ec54..4600c1a208 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -194,6 +194,7 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str)) // TODO return false; } +#if WXWIN_COMPATIBILITY_2_4 /* * wxVariantDataStringList @@ -303,6 +304,8 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) return false; } +#endif //2.4 compat + /* * wxVariantDataLong */ @@ -1248,12 +1251,16 @@ wxVariant::wxVariant(const wxChar* val, const wxString& name) m_name = name; } +#if WXWIN_COMPATIBILITY_2_4 + wxVariant::wxVariant(const wxStringList& val, const wxString& name) { m_data = new wxVariantDataStringList(val); m_name = name; } +#endif + wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants { m_data = new wxVariantDataList(val); @@ -1539,6 +1546,8 @@ void wxVariant::operator= (const wxChar* value) } } +#if WXWIN_COMPATIBILITY_2_4 + bool wxVariant::operator== (const wxStringList& value) const { wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); @@ -1566,6 +1575,8 @@ void wxVariant::operator= (const wxStringList& value) } } +#endif + bool wxVariant::operator== (const wxList& value) const { wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); @@ -1710,7 +1721,11 @@ wxArrayString wxVariant::GetArrayString() const // Treat a list variant as an array wxVariant wxVariant::operator[] (size_t idx) const { +#if WXWIN_COMPATIBILITY_2_4 wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") ); +#else + wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") ); +#endif if (GetType() == wxT("list")) { @@ -1718,6 +1733,7 @@ wxVariant wxVariant::operator[] (size_t idx) const wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); } +#if WXWIN_COMPATIBILITY_2_4 else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; @@ -1727,6 +1743,7 @@ wxVariant wxVariant::operator[] (size_t idx) const wxVariant variant( str ); return variant; } +#endif return wxNullVariant; } @@ -1746,18 +1763,24 @@ wxVariant& wxVariant::operator[] (size_t idx) // Return the number of elements in a list int wxVariant::GetCount() const { +#if WXWIN_COMPATIBILITY_2_4 wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") ); +#else + wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") ); +#endif if (GetType() == wxT("list")) { wxVariantDataList* data = (wxVariantDataList*) m_data; return data->GetValue().GetCount(); } +#if WXWIN_COMPATIBILITY_2_4 else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; return data->GetValue().GetCount(); } +#endif return 0; } @@ -1782,7 +1805,7 @@ void wxVariant::SetData(wxVariantData* data) // Returns a string representing the type of the variant, -// e.g. "string", "bool", "stringlist", "list", "double", "long" +// e.g. "string", "bool", "list", "double", "long" wxString wxVariant::GetType() const { if (IsNull()) @@ -1897,6 +1920,8 @@ wxList& wxVariant::GetList() const return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); } +#if WXWIN_COMPATIBILITY_2_4 + wxStringList& wxVariant::GetStringList() const { wxASSERT( (GetType() == wxT("stringlist")) ); @@ -1904,6 +1929,8 @@ wxStringList& wxVariant::GetStringList() const return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); } +#endif + // Make empty list void wxVariant::NullList() { -- 2.45.2