X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71520754fc7c981b2fdfd711a7091548347a51b0..a2c5db764c8450dda6e87fe58917b0a00ec2c74f:/include/wx/variant.h diff --git a/include/wx/variant.h b/include/wx/variant.h index 10a8fa896e..a0341750e4 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -20,6 +20,7 @@ #include "wx/string.h" #include "wx/arrstr.h" #include "wx/list.h" +#include "wx/cpp.h" #if wxUSE_DATETIME #include "wx/datetime.h" @@ -68,15 +69,15 @@ public: // Override these to provide common functionality virtual bool Eq(wxVariantData& data) const = 0; - + #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const { return false; } + virtual bool Write(wxSTD ostream& WXUNUSED(str)) const { return false; } #endif - virtual bool Write(wxString& str) const { return false; } + virtual bool Write(wxString& WXUNUSED(str)) const { return false; } #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) { return false; } + virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; } #endif - virtual bool Read(wxString& str) { return false; } + virtual bool Read(wxString& WXUNUSED(str)) { return false; } // What type is it? Return a string name. virtual wxString GetType() const = 0; // If it based on wxObject return the ClassInfo. @@ -99,7 +100,7 @@ protected: private: int m_count; - + private: DECLARE_ABSTRACT_CLASS(wxVariantData) }; @@ -113,7 +114,7 @@ class WXDLLIMPEXP_BASE wxVariant: public wxObject { public: wxVariant(); - + wxVariant(const wxVariant& variant); wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); virtual ~wxVariant(); @@ -124,7 +125,7 @@ public: // 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; @@ -133,7 +134,7 @@ public: inline const wxString& GetName() const { return m_name; } // Tests whether there is data - bool IsNull() const; + bool IsNull() const; // For compatibility with wxWidgets <= 2.6, this doesn't increase // reference count. @@ -148,10 +149,10 @@ public: // 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; @@ -159,9 +160,9 @@ public: bool IsType(const wxString& type) const; bool IsValueKindOf(const wxClassInfo* type) const; - // write contents to a string (e.g. for debugging) + // 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; @@ -170,7 +171,7 @@ public: 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); @@ -181,8 +182,8 @@ public: inline operator long () const { return GetLong(); } inline long GetInteger() const { return GetLong(); } long GetLong() const; - - // bool + + // bool #ifdef HAVE_BOOL wxVariant(bool val, const wxString& name = wxEmptyString); bool operator== (bool value) const; @@ -194,7 +195,7 @@ public: // wxDateTime #if wxUSE_DATETIME - wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); + 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); @@ -214,28 +215,60 @@ public: // wxString wxVariant(const wxString& val, const wxString& name = wxEmptyString); - wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool! + // these overloads are necessary to prevent the compiler from using bool + // version instead of wxString one: + wxVariant(const char* val, const wxString& name = wxEmptyString); + wxVariant(const wchar_t* val, const wxString& name = wxEmptyString); + wxVariant(const wxCStrData& val, const wxString& name = wxEmptyString); + wxVariant(const wxCharBuffer& val, const wxString& name = wxEmptyString); + wxVariant(const wxWCharBuffer& val, const wxString& name = wxEmptyString); + 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! + wxVariant& operator=(const wxString& value); + // these overloads are necessary to prevent the compiler from using bool + // version instead of wxString one: + wxVariant& operator=(const char* value) + { return *this = wxString(value); } + wxVariant& operator=(const wchar_t* value) + { return *this = wxString(value); } + wxVariant& operator=(const wxCStrData& value) + { return *this = value.AsString(); } + template + wxVariant& operator=(const wxCharTypeBuffer& value) + { return *this = value.data(); } + inline operator wxString () const { return MakeString(); } wxString GetString() const; - // wxChar - wxVariant(wxChar val, const wxString& name = wxEmptyString); - bool operator== (wxChar value) const; - bool operator!= (wxChar value) const; - void operator= (wxChar value) ; - inline operator wxChar () const { return GetChar(); } - wxChar GetChar() const ; - + // wxUniChar + wxVariant(const wxUniChar& val, const wxString& name = wxEmptyString); + wxVariant(const wxUniCharRef& val, const wxString& name = wxEmptyString); + wxVariant(char val, const wxString& name = wxEmptyString); + wxVariant(wchar_t val, const wxString& name = wxEmptyString); + bool operator==(const wxUniChar& value) const; + bool operator==(const wxUniCharRef& value) const { return *this == wxUniChar(value); } + bool operator==(char value) const { return *this == wxUniChar(value); } + bool operator==(wchar_t value) const { return *this == wxUniChar(value); } + bool operator!=(const wxUniChar& value) const { return !(*this == value); } + bool operator!=(const wxUniCharRef& value) const { return !(*this == value); } + bool operator!=(char value) const { return !(*this == value); } + bool operator!=(wchar_t value) const { return !(*this == value); } + wxVariant& operator=(const wxUniChar& value); + wxVariant& operator=(const wxUniCharRef& value) { return *this = wxUniChar(value); } + wxVariant& operator=(char value) { return *this = wxUniChar(value); } + wxVariant& operator=(wchar_t value) { return *this = wxUniChar(value); } + operator wxUniChar() const { return GetChar(); } + operator char() const { return GetChar(); } + operator wchar_t() const { return GetChar(); } + wxUniChar 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(); } + operator wxArrayString () const { return GetArrayString(); } wxArrayString GetArrayString() const; // void* @@ -243,7 +276,7 @@ public: bool operator== (void* value) const; bool operator!= (void* value) const; void operator= (void* value); - inline operator void* () const { return GetVoidPtr(); } + operator void* () const { return GetVoidPtr(); } void* GetVoidPtr() const; // wxObject* @@ -254,14 +287,6 @@ public: 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 // ------------------------------ @@ -277,7 +302,7 @@ public: // Return the number of elements in a list size_t GetCount() const; - + // Make empty list void NullList(); @@ -302,7 +327,9 @@ public: bool Convert(bool* value) const; bool Convert(double* value) const; bool Convert(wxString* value) const; + bool Convert(wxUniChar* value) const; bool Convert(char* value) const; + bool Convert(wchar_t* value) const; #if wxUSE_DATETIME bool Convert(wxDateTime* value) const; #endif // wxUSE_DATETIME @@ -311,14 +338,105 @@ 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 -//in a seemingly safe way so the compiler can check, so we define -//a dynamic_cast /wxDynamicCast analogue. +#define DECLARE_VARIANT_OBJECT(classname) \ + DECLARE_VARIANT_OBJECT_EXPORTED(classname, wxEMPTY_PARAMETER_VALUE) + +#define DECLARE_VARIANT_OBJECT_EXPORTED(classname,expdecl) \ +expdecl classname& operator << ( classname &object, const wxVariant &variant ); \ +expdecl wxVariant& operator << ( wxVariant &variant, const classname &object ); + +#define IMPLEMENT_VARIANT_OBJECT(classname) \ + IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname, wxEMPTY_PARAMETER_VALUE) + +#define IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,expdecl) \ +class classname##VariantData: public wxVariantData \ +{ \ +public:\ + classname##VariantData() {} \ + classname##VariantData( const classname &value ) { m_value = value; } \ +\ + classname &GetValue() { return m_value; } \ +\ + virtual bool Eq(wxVariantData& data) const; \ +\ + virtual wxString GetType() const; \ + virtual wxClassInfo* GetValueClassInfo(); \ +\ +protected:\ + classname m_value; \ +\ +private: \ + DECLARE_CLASS(classname##VariantData) \ +};\ +\ +IMPLEMENT_CLASS(classname##VariantData, wxVariantData)\ +\ +wxString classname##VariantData::GetType() const\ +{\ + return m_value.GetClassInfo()->GetClassName();\ +}\ +\ +wxClassInfo* classname##VariantData::GetValueClassInfo()\ +{\ + return m_value.GetClassInfo();\ +}\ +\ +expdecl classname& operator << ( classname &value, const wxVariant &variant )\ +{\ + wxASSERT( wxIsKindOf( variant.GetData(), classname##VariantData ) );\ + \ + classname##VariantData *data = (classname##VariantData*) variant.GetData();\ + value = data->GetValue();\ + return value;\ +}\ +\ +expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\ +{\ + classname##VariantData *data = new classname##VariantData( value );\ + variant.SetData( data );\ + return variant;\ +} + +// implements a wxVariantData-derived class using for the Eq() method the +// operator== which must have been provided by "classname" +#define IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,expdecl) \ +IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdecl) \ +\ +bool classname##VariantData::Eq(wxVariantData& data) const \ +{\ + wxASSERT( wxIsKindOf((&data), classname##VariantData) );\ +\ + classname##VariantData & otherData = (classname##VariantData &) data;\ +\ + return otherData.m_value == m_value;\ +}\ + + +// implements a wxVariantData-derived class using for the Eq() method a shallow +// comparison (through wxObject::IsSameAs function) +#define IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(classname) \ + IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname, wxEMPTY_PARAMETER_VALUE) +#define IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname,expdecl) \ +IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdecl) \ +\ +bool classname##VariantData::Eq(wxVariantData& data) const \ +{\ + wxASSERT( wxIsKindOf((&data), classname##VariantData) );\ +\ + classname##VariantData & otherData = (classname##VariantData &) data;\ +\ + return (otherData.m_value.IsSameAs(m_value));\ +}\ + + +// Since we want type safety wxVariant we need to fetch and dynamic_cast +// in a seemingly safe way so the compiler can check, so we define +// a dynamic_cast /wxDynamicCast analogue. #define wxGetVariantCast(var,classname) \ ((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\