From 2562c82329113d43b0de122c86ac23f0dca0e669 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 30 Sep 2006 11:20:14 +0000 Subject: [PATCH] Applied ref-couting patch. Completely reorganized code (more readable to me). Minor other changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/variant.tex | 55 +- include/wx/variant.h | 305 +++--- src/common/variant.cpp | 1843 ++++++++++++++++++------------------- 3 files changed, 1097 insertions(+), 1106 deletions(-) diff --git a/docs/latex/wx/variant.tex b/docs/latex/wx/variant.tex index eecefc84b4..a6cd0b1a1c 100644 --- a/docs/latex/wx/variant.tex +++ b/docs/latex/wx/variant.tex @@ -15,7 +15,18 @@ The {\bf wxVariant} class represents a container for any type. A variant's value can be changed at run time, possibly to a different type of value. As standard, wxVariant can store values of type bool, char, double, long, string, -string list, time, date, void pointer, list of strings, and list of variants. However, an application can extend wxVariant's capabilities by deriving from the class \helpref{wxVariantData}{wxvariantdata} and using the wxVariantData form of the wxVariant constructor or assignment operator to assign this data to a variant. Actual values for user-defined types will need to be accessed via the wxVariantData object, unlike the case for basic data types where convenience functions such as GetLong can be used. +string list, time, date, void pointer, list of strings, and list of variants. +However, an application can extend wxVariant's capabilities by deriving from the +class \helpref{wxVariantData}{wxvariantdata} and using the wxVariantData form of +the wxVariant constructor or assignment operator to assign this data to a variant. +Actual values for user-defined types will need to be accessed via the wxVariantData +object, unlike the case for basic data types where convenience functions such as +\helpref{GetLong}{wxvariantgetlong} can be used. + +Pointers to any \helpref{wxObject}{helpref} derived class can also easily be stored +in a wxVariant. wxVariant will then use wxWidgets' built-in RTTI system to set the +type name (returned by \helpref{GetType}{wxvariantgettype}) and to perform +type-safety checks at runtime. This class is useful for reducing the programming for certain tasks, such as an editor for different data types, or a remote procedure call protocol. @@ -23,6 +34,8 @@ for different data types, or a remote procedure call protocol. An optional name member is associated with a wxVariant. This might be used, for example, in CORBA or OLE automation classes, where named parameters are required. +Note that as of wxWidgets 2.7.1, wxVariant is reference counted. + \wxheading{Derived from} \helpref{wxObject}{wxobject} @@ -114,6 +127,9 @@ Construction from a odbc timestamp value. Represented internally by a \helpref{ Destructor. +Note that destructor is protected, so wxVariantData cannot usually +be deleted. Instead, \helpref{DecRef}{wxvariantdatadecref} should be called. + \membersection{wxVariant::Append}\label{wxvariantappend} @@ -121,6 +137,13 @@ Destructor. Appends a value to the list. +\membersection{wxVariant::Clear}\label{wxvariantclear} + +\func{void}{Clear}{\void} + +Makes the variant null by deleting the internal data and +set the name to {\it wxEmptyString}. + \membersection{wxVariant::ClearList}\label{wxvariantclearlist} \func{void}{ClearList}{\void} @@ -179,7 +202,10 @@ Returns the character value. \constfunc{wxVariantData*}{GetData}{\void} -Returns a pointer to the internal variant data. +Returns a pointer to the internal variant data. To take ownership +of this data, you must call its \helpref{IncRef}{wxvariantdataincref} +method. When you stop using it, \helpref{DecRef}{wxvariantdatadecref} +must be likewise called. \membersection{wxVariant::GetDateTime}\label{wxvariantgetdatetime} @@ -428,6 +454,15 @@ Operator for implicit conversion to a pointer to a \helpref{wxDateTime}{wxdateti The {\bf wxVariantData} is used to implement a new type for wxVariant. Derive from wxVariantData, and override the pure virtual functions. +wxVariantData is reference counted, but you don't normally have to care about this, as +wxVariant manages the count automatically. However, incase your application needs to take +ownership of wxVariantData, be aware that the object is created with reference count of 1, +and passing it to wxVariant will not increase this. In other words, \helpref{IncRef}{wxvariantdataincref} +needs to be called only if you both take ownership of wxVariantData and pass it to a wxVariant. +Also note that the destructor is protected, so you can never explicitly delete a wxVariantData +instance. Instead, \helpref{DecRef}{wxvariantdatadecref} will delete the object automatically +when the reference count reaches zero. + \wxheading{Derived from} \helpref{wxObject}{wxobject} @@ -448,11 +483,15 @@ and override the pure virtual functions. Default constructor. -\membersection{wxVariantData::Copy}\label{wxvariantdatacopy} +\membersection{wxVariantData::DecRef}\label{wxvariantdatadecref} + +\func{void}{DecRef}{\void} -\func{void}{Copy}{\param{wxVariantData\&}{ data}} +Decreases reference count. If the count reaches zero, the object is +automatically deleted. -Copy the data from `this' object to {\it data}. +Note that destructor of wxVariantData is protected, so delete +cannot be used as normal. Instead, DecRef should be called. \membersection{wxVariantData::Eq}\label{wxvariantdataeq} @@ -473,6 +512,12 @@ Returns the string type of the data. If the data is a wxObject returns a pointer to the objects wxClassInfo structure, if the data isn't a wxObject the method returns NULL. +\membersection{wxVariantData::IncRef}\label{wxvariantdataincref} + +\func{void}{IncRef}{\void} + +Increases reference count. Note that initially wxVariantData has reference count of 1. + \membersection{wxVariantData::Read}\label{wxvariantdataread} \func{bool}{Read}{\param{ostream\&}{ stream}} diff --git a/include/wx/variant.h b/include/wx/variant.h index 2086ee3867..8626389114 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -36,6 +36,19 @@ * to allow it to store any type of data. * Derive from this to provide custom data handling. * + * NB: To prevent addition of extra vtbl pointer to wxVariantData, + * we don't multiple-inherit from wxObjectRefData. Instead, + * we simply replicate the wxObject ref-counting scheme. + * + * NB: When you construct a wxVariantData, it will have refcount + * of one. Refcount will not be further increased when + * it is passed to wxVariant. This simulates old common + * scenario where wxVariant took ownership of wxVariantData + * passed to it. + * If you create wxVariantData for other reasons than passing + * it to wxVariant, technically you are not required to call + * DecRef() before deleting it. + * * TODO: in order to replace wxPropertyValue, we would need * to consider adding constructors that take pointers to C++ variables, * or removing that functionality from the wxProperty library. @@ -47,198 +60,224 @@ class WXDLLIMPEXP_BASE wxVariantData: public wxObject { -DECLARE_ABSTRACT_CLASS(wxVariantData) + friend class wxVariant; public: + wxVariantData() + : wxObject(), m_count(1) + { } -// Construction & destruction - wxVariantData() {} - -// Override these to provide common functionality - // Copy to data - virtual void Copy(wxVariantData& data) = 0; + // Override these to provide common functionality virtual bool Eq(wxVariantData& data) const = 0; + #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const = 0; + virtual bool Write(wxSTD ostream& str) const { return false; } #endif - virtual bool Write(wxString& str) const = 0; + virtual bool Write(wxString& str) const { return false; } #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) = 0; + virtual bool Read(wxSTD istream& str) { return false; } #endif - virtual bool Read(wxString& str) = 0; + virtual bool Read(wxString& str) { return false; } // What type is it? Return a string name. virtual wxString GetType() const = 0; // If it based on wxObject return the ClassInfo. virtual wxClassInfo* GetValueClassInfo() { return NULL; } + + void IncRef() { m_count++; } + void DecRef() + { + if ( --m_count == 0 ) + delete this; + } + + int GetRefCount() const { return m_count; } + +protected: + // Protected dtor should make some incompatible code + // break more louder. That is, they should do data->DecRef() + // instead of delete data. + virtual ~wxVariantData() { } + +private: + int m_count; + +private: + DECLARE_ABSTRACT_CLASS(wxVariantData) }; /* * wxVariant can store any kind of data, but has some basic types * built in. - * NOTE: this eventually should have a reference-counting implementation. - * PLEASE, if you change it to ref-counting, make sure it doesn't involve bloating - * this class too much. */ class WXDLLIMPEXP_BASE wxVariant: public wxObject { -DECLARE_DYNAMIC_CLASS(wxVariant) public: - -// Construction & destruction wxVariant(); - wxVariant(double val, const wxString& name = wxEmptyString); - wxVariant(long val, const wxString& name = wxEmptyString); -#ifdef HAVE_BOOL - wxVariant(bool val, const wxString& name = wxEmptyString); -#endif - 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! -#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 - wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data -#if wxUSE_DATETIME - wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); // Date -#endif // wxUSE_DATETIME - wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString); // String array -#if wxUSE_ODBC - wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime - wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime - wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime -#endif - + wxVariant(const wxVariant& variant); + wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); virtual ~wxVariant(); -// Generic operators - // Assignment + // generic assignment void operator= (const wxVariant& variant); -#if wxUSE_DATETIME - bool operator== (const wxDateTime& value) const; - bool operator!= (const wxDateTime& value) const; - void operator= (const wxDateTime& value) ; -#endif // wxUSE_DATETIME - - bool operator== (const wxArrayString& value) const; - bool operator!= (const wxArrayString& value) const; - void operator= (const wxArrayString& value) ; -#if wxUSE_ODBC - void operator= (const DATE_STRUCT* value) ; - void operator= (const TIME_STRUCT* value) ; - void operator= (const TIMESTAMP_STRUCT* value) ; -#endif - // Assignment using data, e.g. // myVariant = new wxStringVariantData("hello"); void operator= (wxVariantData* variantData); + bool operator== (const wxVariant& variant) const; bool operator!= (const wxVariant& variant) const; -// Specific operators + // Sets/gets name + inline void SetName(const wxString& name) { m_name = name; } + inline const wxString& GetName() const { return m_name; } + + // Tests whether there is data + bool IsNull() const; + + // For compatibility with wxWidgets <= 2.6, this doesn't increase + // reference count. + wxVariantData* GetData() const { return m_data; } + void SetData(wxVariantData* data) ; + + // make a 'clone' of the object + void Ref(const wxVariant& clone); + + // destroy a reference + void UnRef(); + + // Make NULL (i.e. delete the data) + void MakeNull(); + + // Delete data and name + void Clear(); + + // Returns a string representing the type of the variant, + // e.g. "string", "bool", "stringlist", "list", "double", "long" + wxString GetType() const; + + bool IsType(const wxString& type) const; + bool IsValueKindOf(const wxClassInfo* type) const; + + // write contents to a string (e.g. for debugging) + wxString MakeString() const; + + // double + wxVariant(double val, const wxString& name = wxEmptyString); bool operator== (double value) const; bool operator!= (double value) const; void operator= (double value) ; + inline operator double () const { return GetDouble(); } + inline double GetReal() const { return GetDouble(); } + double GetDouble() const; + + // long + wxVariant(long val, const wxString& name = wxEmptyString); + wxVariant(int val, const wxString& name = wxEmptyString); + wxVariant(short val, const wxString& name = wxEmptyString); bool operator== (long value) const; bool operator!= (long value) const; void operator= (long value) ; - bool operator== (char value) const; - bool operator!= (char value) const; - void operator= (char value) ; + inline operator long () const { return GetLong(); } + inline long GetInteger() const { return GetLong(); } + long GetLong() const; + + // bool #ifdef HAVE_BOOL + wxVariant(bool val, const wxString& name = wxEmptyString); bool operator== (bool value) const; bool operator!= (bool value) const; void operator= (bool value) ; + inline operator bool () const { return GetBool(); } + bool GetBool() const ; +#endif + + // wxDateTime +#if wxUSE_DATETIME + wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); +#if wxUSE_ODBC + wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString); + wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString); + wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString); +#endif + bool operator== (const wxDateTime& value) const; + bool operator!= (const wxDateTime& value) const; + void operator= (const wxDateTime& value) ; +#if wxUSE_ODBC + void operator= (const DATE_STRUCT* value) ; + void operator= (const TIME_STRUCT* value) ; + void operator= (const TIMESTAMP_STRUCT* value) ; +#endif + inline operator wxDateTime () const { return GetDateTime(); } + wxDateTime GetDateTime() const; #endif + + // wxString + wxVariant(const wxString& val, const wxString& name = wxEmptyString); + wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool! bool operator== (const wxString& value) const; bool operator!= (const wxString& value) const; void operator= (const wxString& value) ; void operator= (const wxChar* value) ; // Necessary or VC++ assumes bool! + inline operator wxString () const { return MakeString(); } + wxString GetString() const; + + // char (wxChar?) + wxVariant(char val, const wxString& name = wxEmptyString); + bool operator== (char value) const; + bool operator!= (char value) const; + void operator= (char value) ; + inline operator char () const { return GetChar(); } + char GetChar() const ; + + // wxArrayString + wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString); + bool operator== (const wxArrayString& value) const; + bool operator!= (const wxArrayString& value) const; + void operator= (const wxArrayString& value); + inline operator wxArrayString () const { return GetArrayString(); } + wxArrayString GetArrayString() const; + + // void* + wxVariant(void* ptr, const wxString& name = wxEmptyString); + bool operator== (void* value) const; + bool operator!= (void* value) const; + void operator= (void* value); + inline operator void* () const { return GetVoidPtr(); } + void* GetVoidPtr() const; + + // wxObject* + wxVariant(wxObject* ptr, const wxString& name = wxEmptyString); + bool operator== (wxObject* value) const; + bool operator!= (wxObject* value) const; + void operator= (wxObject* value); + wxObject* GetWxObjectPtr() const; + + #if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( wxVariant(const wxStringList& val, const wxString& name = wxEmptyString) ); wxDEPRECATED( bool operator== (const wxStringList& value) const ); wxDEPRECATED( bool operator!= (const wxStringList& value) const ); wxDEPRECATED( void operator= (const wxStringList& value) ); + wxDEPRECATED( wxStringList& GetStringList() const ); #endif + + // ------------------------------ + // list operations + // ------------------------------ + + wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants bool operator== (const wxList& value) const; bool operator!= (const wxList& value) const; void operator= (const wxList& value) ; - bool operator== (void* value) const; - bool operator!= (void* value) const; - void operator= (void* value); - bool operator== (wxObject* value) const; - bool operator!= (wxObject* value) const; - void operator= (wxObject* value); - - // Treat a list variant as an array wxVariant operator[] (size_t idx) const; wxVariant& operator[] (size_t idx) ; - - // Implicit conversion to a wxString - inline operator wxString () const { return MakeString(); } - wxString MakeString() const; - - // Other implicit conversions - inline operator double () const { return GetDouble(); } - inline operator char () const { return GetChar(); } - inline operator long () const { return GetLong(); } - inline operator bool () const { return GetBool(); } - inline operator void* () const { return GetVoidPtr(); } - // No implicit conversion to wxObject, as that would really - // confuse people between conversion to our contained data - // and downcasting to see our base type. -#if wxUSE_DATETIME - inline operator wxDateTime () const { return GetDateTime(); } -#endif // wxUSE_DATETIME - -// Accessors - // Sets/gets name - inline void SetName(const wxString& name) { m_name = name; } - inline const wxString& GetName() const { return m_name; } - - // Tests whether there is data - inline bool IsNull() const { return (m_data == (wxVariantData*) NULL); } - - wxVariantData* GetData() const { return m_data; } - void SetData(wxVariantData* data) ; - - // Returns a string representing the type of the variant, - // e.g. "string", "bool", "stringlist", "list", "double", "long" - wxString GetType() const; - - bool IsType(const wxString& type) const; - bool IsValueKindOf(const wxClassInfo* type) const; + wxList& GetList() const ; // Return the number of elements in a list size_t GetCount() const; - -// Value accessors - double GetReal() const ; - inline double GetDouble() const { return GetReal(); }; - long GetInteger() const ; - inline long GetLong() const { return GetInteger(); }; - char GetChar() const ; - bool GetBool() const ; - wxString GetString() const ; - wxList& GetList() const ; -#if WXWIN_COMPATIBILITY_2_4 - wxDEPRECATED( wxStringList& GetStringList() const ); -#endif - void* GetVoidPtr() const; - wxObject* GetWxObjectPtr() const; -#if wxUSE_DATETIME - wxDateTime GetDateTime() const ; -#endif // wxUSE_DATETIME - wxArrayString GetArrayString() const; - -// Operations - // Make NULL (i.e. delete the data) - void MakeNull(); - + // Make empty list void NullList(); @@ -257,9 +296,8 @@ public: // Clear list void ClearList(); -// Implementation public: -// Type conversion + // Type conversion bool Convert(long* value) const; bool Convert(bool* value) const; bool Convert(double* value) const; @@ -273,6 +311,9 @@ public: protected: wxVariantData* m_data; wxString m_name; + +private: + DECLARE_DYNAMIC_CLASS(wxVariant) }; //Since we want type safety wxVariant we need to fetch and dynamic_cast diff --git a/src/common/variant.cpp b/src/common/variant.cpp index b17b2c1f66..37dc2c3f41 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,11 +582,60 @@ 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 { @@ -631,7 +647,6 @@ public: 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; #if wxUSE_STD_IOSTREAM virtual bool Read(wxSTD istream& str); @@ -651,15 +666,6 @@ protected: 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") ); @@ -718,9 +724,55 @@ bool wxVariantDataChar::Read(wxString& str) return true; } -/* - * wxVariantDataString - */ +wxVariant::wxVariant(char val, const wxString& name) +{ + m_data = new wxVariantDataChar(val); + m_name = name; +} + +bool wxVariant::operator== (char value) const +{ + char thisValue; + if (!Convert(&thisValue)) + return false; + else + return (value == thisValue); +} + +bool wxVariant::operator!= (char value) const +{ + return (!((*this) == value)); +} + +void wxVariant::operator= (char value) +{ + if (GetType() == wxT("char") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataChar*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataChar(value); + } +} + +char wxVariant::GetChar() const +{ + char 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 +784,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 +803,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 +852,76 @@ bool wxVariantDataString::Read(wxString& str) IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) -/* - * wxVariantDataVoidPtr - */ - -class wxVariantDataVoidPtr: public wxVariantData +// wxVariant **** + +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") ); + m_data = new wxVariantDataString(wxString(val)); + m_name = name; +} - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; +bool wxVariant::operator== (const wxString& value) const +{ + wxString thisValue; + if (!Convert(&thisValue)) + return false; - otherData.m_value = m_value; + return value == thisValue; } -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; - - return (otherData.m_value == m_value); + return (!((*this) == value)); } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const +void wxVariant::operator= (const wxString& value) { - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return true; + if (GetType() == wxT("string") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataString*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataString(value); + } } -#endif -bool wxVariantDataVoidPtr::Write(wxString& str) const +void wxVariant::operator= (const wxChar* value) { - str.Printf(wxT("%p"), m_value); - return true; + if (GetType() == wxT("string") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataString*)GetData())->SetValue(wxString(value)); + } + else + { + UnRef(); + m_data = new wxVariantDataString(wxString(value)); + } } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) +wxString wxVariant::GetString() const { - // Not implemented - return false; -} -#endif + wxString value; + if (!Convert(& value)) + { + wxFAIL_MSG(wxT("Could not convert to a string")); + } -bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) -{ - // Not implemented - return false; + return value; } -/* - * wxVariantDataWxObjectPtr - */ +// ---------------------------------------------------------------------------- +// wxVariantDataWxObjectPtr +// ---------------------------------------------------------------------------- class wxVariantDataWxObjectPtr: public wxVariantData { @@ -907,7 +933,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 +954,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 +1011,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 +1064,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; +} + +bool wxVariant::operator== (void* value) const +{ + return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); } -#endif +bool wxVariant::operator!= (void* value) const +{ + return (!((*this) == (void*) value)); +} -bool wxVariantDataDateTime::Read(wxString& str) +void wxVariant::operator= (void* value) { - if(! m_value.ParseDateTime(str)) - return false; - return true; + if (GetType() == wxT("void*") && + m_data->GetRefCount() == 1) + { + ((wxVariantDataVoidPtr*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataVoidPtr(value); + } } -#endif // wxUSE_DATETIME +void* wxVariant::GetVoidPtr() const +{ + 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 +1188,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 +1235,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,437 +1270,435 @@ 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) -{ - if (variant.IsNull()) - { - MakeNull(); - return; - } +#endif // wxUSE_ODBC - if (IsNull() || (GetType() != variant.GetType())) +wxDateTime wxVariant::GetDateTime() const +{ + wxDateTime value; + if (!Convert(& value)) { - if (m_data) - delete m_data; - m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject(); + wxFAIL_MSG(wxT("Could not convert to a datetime")); } - variant.GetData()->Copy(* GetData()); - - m_name = variant.m_name; + return value; } -// Assignment using data, e.g. -// myVariant = new wxStringVariantData("hello") -void wxVariant::operator= (wxVariantData* variantData) -{ - MakeNull(); - m_data = variantData; -} +#endif // wxUSE_DATETIME -bool wxVariant::operator== (const wxVariant& variant) const +// ---------------------------------------------------------------------------- +// wxVariantDataArrayString +// ---------------------------------------------------------------------------- + +class wxVariantDataArrayString: public wxVariantData { - if (IsNull() || variant.IsNull()) - return (IsNull() == variant.IsNull()); +public: + wxVariantDataArrayString() { } + wxVariantDataArrayString(const wxArrayString& value) { m_value = value; } - return (GetData()->Eq(* variant.GetData())); -} + wxArrayString GetValue() const { return m_value; } + void SetValue(const wxArrayString& value) { m_value = value; } -bool wxVariant::operator!= (const wxVariant& variant) const -{ - return (!(*this == variant)); -} + 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; } +protected: + wxArrayString m_value; -// Specific operators -bool wxVariant::operator== (double value) const -{ - double thisValue; - if (!Convert(&thisValue)) - return false; + DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString) +}; - return wxIsSameDouble(value, thisValue); -} +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData) -bool wxVariant::operator!= (double value) const +bool wxVariantDataArrayString::Eq(wxVariantData& data) const { - return (!((*this) == value)); -} + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") ); -void wxVariant::operator= (double value) -{ - if (GetType() == wxT("double")) - { - ((wxVariantDataReal*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataReal(value); - } -} + wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; -bool wxVariant::operator== (long value) const -{ - long thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); + return otherData.m_value == m_value; } -bool wxVariant::operator!= (long 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= (long value) +bool wxVariantDataArrayString::Write(wxString& str) const { - if (GetType() == wxT("long")) - { - ((wxVariantDataLong*)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 wxVariantDataLong(value); + if ( n ) + str += _T(';'); + + str += m_value[n]; } -} -bool wxVariant::operator== (char value) const -{ - char thisValue; - if (!Convert(&thisValue)) - return false; - else - return (value == thisValue); + return true; } -bool wxVariant::operator!= (char value) const + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) { - return (!((*this) == value)); + // Not implemented + return false; } +#endif -void wxVariant::operator= (char value) + +bool wxVariantDataArrayString::Read(wxString& str) { - if (GetType() == wxT("char")) - { - ((wxVariantDataChar*)GetData())->SetValue(value); - } - else + wxStringTokenizer tk(str, _T(";")); + while ( tk.HasMoreTokens() ) { - if (m_data) - delete m_data; - m_data = new wxVariantDataChar(value); + m_value.Add(tk.GetNextToken()); } -} -#ifdef HAVE_BOOL -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)); + return true; } -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); - } +// wxVariant + +wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings +{ + m_data = new wxVariantDataArrayString(val); + m_name = name; } -#endif // HAVE_BOOL -bool wxVariant::operator== (const wxString& value) const +bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const { - wxString thisValue; - if (!Convert(&thisValue)) - return false; + wxFAIL_MSG( _T("TODO") ); - return value == thisValue; + return false; } -bool wxVariant::operator!= (const wxString& value) const +bool wxVariant::operator!=(const wxArrayString& value) const { - return (!((*this) == value)); + return !(*this == value); } -void wxVariant::operator= (const wxString& value) +void wxVariant::operator=(const wxArrayString& value) { - if (GetType() == wxT("string")) + if (GetType() == wxT("arrstring") && + m_data->GetRefCount() == 1) { - ((wxVariantDataString*)GetData())->SetValue(value); + ((wxVariantDataArrayString *)GetData())->SetValue(value); } else { - if (m_data) - delete m_data; - m_data = new wxVariantDataString(value); + UnRef(); + m_data = new wxVariantDataArrayString(value); } } -void wxVariant::operator= (const wxChar* value) +wxArrayString wxVariant::GetArrayString() const { - if (GetType() == wxT("string")) - { - ((wxVariantDataString*)GetData())->SetValue(wxString(value)); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataString(wxString(value)); - } + if ( GetType() == wxT("arrstring") ) + return ((wxVariantDataArrayString *)GetData())->GetValue(); + + return wxArrayString(); } -#if WXWIN_COMPATIBILITY_2_4 +// ---------------------------------------------------------------------------- +// wxVariantDataList +// ---------------------------------------------------------------------------- -bool wxVariant::operator== (const wxStringList& value) const +class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData { - wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); +DECLARE_DYNAMIC_CLASS(wxVariantDataList) +public: + wxVariantDataList() {} + wxVariantDataList(const wxList& list); + virtual ~wxVariantDataList(); - wxVariantDataStringList other(value); - return (m_data->Eq(other)); -} + wxList& GetValue() { return m_value; } + void SetValue(const wxList& value) ; -bool wxVariant::operator!= (const wxStringList& value) const -{ - wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); + 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"); }; - wxVariantDataStringList other(value); - return !(m_data->Eq(other)); -} + void Clear(); -void wxVariant::operator= (const wxStringList& value) -{ - if (GetType() == wxT("stringlist")) - { - ((wxVariantDataStringList*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataStringList(value); - } -} +protected: + wxList m_value; +}; -#endif +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData) -bool wxVariant::operator== (const wxList& value) const +wxVariantDataList::wxVariantDataList(const wxList& list) { - wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); - - wxVariantDataList other(value); - return (m_data->Eq(other)); + SetValue(list); } -bool wxVariant::operator!= (const wxList& value) const +wxVariantDataList::~wxVariantDataList() { - return (!((*this) == value)); + Clear(); } -void wxVariant::operator= (const wxList& value) +void wxVariantDataList::SetValue(const wxList& value) { - if (GetType() == wxT("list")) + Clear(); + wxList::compatibility_iterator node = value.GetFirst(); + while (node) { - ((wxVariantDataList*)GetData())->SetValue(value); + wxVariant* var = (wxVariant*) node->GetData(); + m_value.Append(new wxVariant(*var)); + node = node->GetNext(); } - else +} + +void wxVariantDataList::Clear() +{ + wxList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - if (m_data) - delete m_data; - m_data = new wxVariantDataList(value); + wxVariant* var = (wxVariant*) node->GetData(); + delete var; + node = node->GetNext(); } + m_value.Clear(); } -bool wxVariant::operator== (void* value) const +bool wxVariantDataList::Eq(wxVariantData& data) const { - return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); + 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; } -bool wxVariant::operator!= (void* value) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Write(wxSTD ostream& str) const { - return (!((*this) == (void*) value)); + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; } +#endif -void wxVariant::operator= (void* value) +bool wxVariantDataList::Write(wxString& str) const { - if (GetType() == wxT("void*")) - { - ((wxVariantDataVoidPtr*)GetData())->SetValue(value); - } - else + str = wxEmptyString; + wxList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - if (m_data) - delete m_data; - m_data = new wxVariantDataVoidPtr(value); + wxVariant* var = (wxVariant*) node->GetData(); + if (node != m_value.GetFirst()) + str += wxT(" "); + wxString str1; + str += var->MakeString(); + node = node->GetNext(); } + + return true; } -bool wxVariant::operator== (wxObject* value) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) { - return (value == ((wxVariantDataWxObjectPtr*)GetData())->GetValue()); + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; } +#endif -bool wxVariant::operator!= (wxObject* value) const +bool wxVariantDataList::Read(wxString& WXUNUSED(str)) { - return (!((*this) == (void*) value)); + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; } -void wxVariant::operator= (wxObject* value) +// wxVariant + +wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants { - if (m_data) - delete m_data; - m_data = new wxVariantDataWxObjectPtr(value); + m_data = new wxVariantDataList(val); + m_name = name; } -#if wxUSE_DATETIME -bool wxVariant::operator== (const wxDateTime& value) const +bool wxVariant::operator== (const wxList& value) const { - wxDateTime thisValue; - if (!Convert(&thisValue)) - return false; + wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); - return value.IsEqualTo(thisValue); + wxVariantDataList other(value); + return (GetData()->Eq(other)); } -bool wxVariant::operator!= (const wxDateTime& value) const +bool wxVariant::operator!= (const wxList& value) const { return (!((*this) == value)); } -void wxVariant::operator= (const wxDateTime& value) +void wxVariant::operator= (const wxList& value) { - if (GetType() == wxT("datetime")) + if (GetType() == wxT("list") && + m_data->GetRefCount() == 1) { - ((wxVariantDataDateTime*)GetData())->SetValue(value); + ((wxVariantDataList*)GetData())->SetValue(value); } else { - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); + UnRef(); + m_data = new wxVariantDataList(value); } } -#endif // wxUSE_DATETIME -#if wxUSE_ODBC -void wxVariant::operator= (const DATE_STRUCT* value) +wxList& wxVariant::GetList() const { - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); -} + wxASSERT( (GetType() == wxT("list")) ); + return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); +} -void wxVariant::operator= (const TIME_STRUCT* value) +// Make empty list +void wxVariant::NullList() { - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); + SetData(new wxVariantDataList()); } - -void wxVariant::operator= (const TIMESTAMP_STRUCT* value) +// Append to list +void wxVariant::Append(const wxVariant& value) { - if (m_data) - delete m_data; - m_data = new wxVariantDataDateTime(value); + wxList& list = GetList(); + + list.Append(new wxVariant(value)); } -#endif // wxUSE_ODBC +// Insert at front of list +void wxVariant::Insert(const wxVariant& value) +{ + wxList& list = GetList(); -bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const + list.Insert(new wxVariant(value)); +} + +// Returns true if the variant is a member of the list +bool wxVariant::Member(const wxVariant& value) const { - wxFAIL_MSG( _T("TODO") ); + 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; } -bool wxVariant::operator!=(const wxArrayString& value) const +// Deletes the nth element of the list +bool wxVariant::Delete(size_t item) { - return !(*this == value); + 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; } -void wxVariant::operator=(const wxArrayString& value) +// Clear list +void wxVariant::ClearList() { - if (GetType() == wxT("arrstring")) + if (!IsNull() && (GetType() == wxT("list"))) { - ((wxVariantDataArrayString *)GetData())->SetValue(value); + ((wxVariantDataList*) m_data)->Clear(); } else { - delete m_data; - m_data = new wxVariantDataArrayString(value); - } -} - -wxArrayString wxVariant::GetArrayString() const -{ - if ( GetType() == wxT("arrstring") ) - return ((wxVariantDataArrayString *)GetData())->GetValue(); + if (!GetType().IsSameAs(wxT("list"))) + UnRef(); - return wxArrayString(); + m_data = new wxVariantDataList; + } } - // Treat a list variant as an array wxVariant wxVariant::operator[] (size_t idx) const { @@ -1801,228 +1765,166 @@ 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; -} +#if WXWIN_COMPATIBILITY_2_4 +// ---------------------------------------------------------------------------- +// wxVariantDataStringList +// ---------------------------------------------------------------------------- -// Returns a string representing the type of the variant, -// e.g. "string", "bool", "list", "double", "long" -wxString wxVariant::GetType() const +class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData { - if (IsNull()) - return wxString(wxT("null")); - else - return m_data->GetType(); -} +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); -bool wxVariant::IsType(const wxString& type) const -{ - return (GetType() == type); -} + 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"); }; -bool wxVariant::IsValueKindOf(const wxClassInfo* type) const -{ - wxClassInfo* info=m_data->GetValueClassInfo(); - return info ? info->IsKindOf(type) : false ; -} +protected: + wxStringList m_value; +}; +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataStringList, wxVariantData) -// Value accessors -double wxVariant::GetReal() const +void wxVariantDataStringList::SetValue(const wxStringList& value) { - double value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a real number")); - return 0.0; - } + m_value = value; } -long wxVariant::GetInteger() const +bool wxVariantDataStringList::Eq(wxVariantData& data) const { - long value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to an integer")); - return 0; - } -} + wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") ); -char wxVariant::GetChar() const -{ - char value; - if (Convert(& value)) - return value; - else + wxVariantDataStringList& listData = (wxVariantDataStringList&) data; + wxStringList::compatibility_iterator node1 = m_value.GetFirst(); + wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst(); + while (node1 && node2) { - wxFAIL_MSG(wxT("Could not convert to a char")); - return 0; + wxString str1 ( node1->GetData() ); + wxString str2 ( node2->GetData() ); + if (str1 != str2) + return false; + node1 = node1->GetNext(); + node2 = node2->GetNext(); } + if (node1 || node2) return false; + return true; } -bool wxVariant::GetBool() const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataStringList::Write(wxSTD ostream& str) const { - bool value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG(wxT("Could not convert to a bool")); - return 0; - } + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; } +#endif -wxString wxVariant::GetString() const +bool wxVariantDataStringList::Write(wxString& str) const { - wxString value; - if (!Convert(& value)) + str.Empty(); + wxStringList::compatibility_iterator node = m_value.GetFirst(); + while (node) { - wxFAIL_MSG(wxT("Could not convert to a string")); + const wxChar* s = node->GetData(); + if (node != m_value.GetFirst()) + str += wxT(" "); + str += s; + node = node->GetNext(); } - return value; -} - -void* wxVariant::GetVoidPtr() const -{ - wxASSERT( (GetType() == wxT("void*")) ); - - return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); + return true; } -wxObject* wxVariant::GetWxObjectPtr() const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str)) { - wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr)); - return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; } +#endif -#if wxUSE_DATETIME -wxDateTime wxVariant::GetDateTime() const +bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) { - wxDateTime value; - if (!Convert(& value)) - { - wxFAIL_MSG(wxT("Could not convert to a datetime")); - } - - return value; + wxFAIL_MSG(wxT("Unimplemented")); + // TODO + return false; } -#endif // wxUSE_DATETIME - -wxList& wxVariant::GetList() const -{ - wxASSERT( (GetType() == wxT("list")) ); - return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); -} +#endif //2.4 compat #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() +wxVariant::wxVariant(const wxStringList& val, const wxString& name) { - SetData(new wxVariantDataList()); + m_data = new wxVariantDataStringList(val); + m_name = name; } -// Append to list -void wxVariant::Append(const wxVariant& value) +bool wxVariant::operator== (const wxStringList& value) const { - wxList& list = GetList(); + wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); - list.Append(new wxVariant(value)); + wxVariantDataStringList other(value); + return (GetData()->Eq(other)); } -// Insert at front of list -void wxVariant::Insert(const wxVariant& value) +bool wxVariant::operator!= (const wxStringList& value) const { - wxList& list = GetList(); + wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") ); - list.Insert(new wxVariant(value)); + wxVariantDataStringList other(value); + return !(GetData()->Eq(other)); } -// Returns true if the variant is a member of the list -bool wxVariant::Member(const wxVariant& value) const +void wxVariant::operator= (const wxStringList& value) { - wxList& list = GetList(); - - wxList::compatibility_iterator node = list.GetFirst(); - while (node) + if (GetType() == wxT("stringlist") && + m_data->GetRefCount() == 1) { - wxVariant* other = (wxVariant*) node->GetData(); - if (value == *other) - return true; - node = node->GetNext(); + ((wxVariantDataStringList*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_data = new wxVariantDataStringList(value); } - return false; } -// Deletes the nth element of the list -bool wxVariant::Delete(size_t item) +// wxVariant + +wxStringList& wxVariant::GetStringList() const { - wxList& list = GetList(); + wxASSERT( (GetType() == wxT("stringlist")) ); - 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; + return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); } -// 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; - } -} +#endif +// ---------------------------------------------------------------------------- // 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 @@ -2041,7 +1943,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 @@ -2069,7 +1971,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 @@ -2123,4 +2025,7 @@ bool wxVariant::Convert(wxDateTime* value) const } #endif // wxUSE_DATETIME + + + #endif // wxUSE_VARIANT -- 2.45.2