X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..f33cb209bfcd7619d69dacde19e97354fb180c39:/include/wx/variant.h?ds=sidebyside diff --git a/include/wx/variant.h b/include/wx/variant.h index 569793c5d3..3c1a55dc0c 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -100,7 +100,6 @@ public: 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 wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); // Date #endif // wxUSE_DATETIME @@ -110,7 +109,6 @@ public: wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime #endif -//TODO: End of Need to document wxVariant(const wxVariant& variant); ~wxVariant(); @@ -119,7 +117,6 @@ public: // Assignment void operator= (const wxVariant& variant); -//TODO: Need to document #if wxUSE_DATETIME bool operator== (const wxDateTime& value) const; bool operator!= (const wxDateTime& value) const; @@ -134,7 +131,6 @@ public: void operator= (const TIME_STRUCT* value) ; void operator= (const TIMESTAMP_STRUCT* value) ; #endif -//TODO: End of Need to document // Assignment using data, e.g. // myVariant = new wxStringVariantData("hello"); @@ -188,11 +184,9 @@ public: // 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(); } #endif // wxUSE_DATETIME -//TODO: End of Need to document // Accessors // Sets/gets name @@ -228,12 +222,10 @@ public: void* GetVoidPtr() const ; wxObject* GetWxObjectPtr() ; -//TODO: Need to document #if wxUSE_DATETIME wxDateTime GetDateTime() const ; #endif // wxUSE_DATETIME wxArrayString GetArrayString() const; -//TODO: End of Need to document // Operations // Make NULL (i.e. delete the data) @@ -265,11 +257,9 @@ public: bool Convert(double* value) const; bool Convert(wxString* value) const; bool Convert(char* value) const; -//TODO: Need to document #if wxUSE_DATETIME bool Convert(wxDateTime* value) const; #endif // wxUSE_DATETIME -//TODO: End of Need to document // Attributes protected: @@ -282,7 +272,7 @@ protected: //a dynamic_cast /wxDynamicCast analogue. #define wxGetVariantCast(var,classname) \ - ((classname*)(var.IsValueKindOf(&classname::sm_class##classname) ?\ + ((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\ var.GetWxObjectPtr() : NULL)); extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;