X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ab25aca26bffe363b1f76623c736602a70eb56f..7a5e53abb3f9ea13eba2880972306446e4e21e83:/include/wx/variant.h?ds=inline diff --git a/include/wx/variant.h b/include/wx/variant.h index e751dde6c1..ef70b0e3ae 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -12,13 +12,14 @@ #ifndef _WX_VARIANT_H_ #define _WX_VARIANT_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "variant.h" #endif #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" +#include "wx/arrstr.h" #include "wx/list.h" #if wxUSE_DATETIME @@ -45,7 +46,7 @@ * overloading wxVariant with unnecessary functionality. */ -class WXDLLEXPORT wxVariantData: public wxObject +class WXDLLIMPEXP_BASE wxVariantData: public wxObject { DECLARE_ABSTRACT_CLASS(wxVariantData) public: @@ -67,6 +68,8 @@ public: virtual bool Read(wxString& str) = 0; // 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; } }; /* @@ -77,7 +80,7 @@ public: * this class too much. */ -class WXDLLEXPORT wxVariant: public wxObject +class WXDLLIMPEXP_BASE wxVariant: public wxObject { DECLARE_DYNAMIC_CLASS(wxVariant) public: @@ -95,6 +98,7 @@ public: wxVariant(const wxStringList& val, const wxString& name = wxEmptyString); 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 //TODO: Need to document #if wxUSE_DATETIME @@ -181,6 +185,9 @@ public: 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. //TODO: Need to document #if wxUSE_DATETIME inline operator wxDateTime () const { return GetDateTime(); } @@ -203,6 +210,7 @@ public: wxString GetType() const; bool IsType(const wxString& type) const; + bool IsValueKindOf(const wxClassInfo* type) const; // Return the number of elements in a list int GetCount() const; @@ -219,6 +227,7 @@ public: wxStringList& GetStringList() const ; void* GetVoidPtr() const ; + wxObject* GetWxObjectPtr() ; //TODO: Need to document #if wxUSE_DATETIME wxDateTime GetDateTime() const ; @@ -268,7 +277,15 @@ protected: wxString m_name; }; -extern wxVariant WXDLLEXPORT wxNullVariant; +//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) ?\ + var.GetWxObjectPtr() : NULL)); + +extern wxVariant WXDLLIMPEXP_BASE wxNullVariant; #endif // _WX_VARIANT_H_