X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6fb99eb3b7063388672255335abf7a34405f51bf..a9102b3671a45d116d781b0c8e90d2e9a84fbdcb:/include/wx/variant.h diff --git a/include/wx/variant.h b/include/wx/variant.h index 3d3ad32484..527d082630 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -95,7 +95,9 @@ public: wxVariant(char val, const wxString& name = wxEmptyString); wxVariant(const wxString& val, const wxString& name = wxEmptyString); wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool! - wxVariant(const wxStringList& val, const wxString& name = wxEmptyString); +#if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( wxVariant(const wxStringList& val, const wxString& name = wxEmptyString) ); +#endif wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose) wxVariant(wxObject* ptr, const wxString& name = wxEmptyString); //wxObject @@ -157,9 +159,11 @@ public: bool operator!= (const wxString& value) const; void operator= (const wxString& value) ; void operator= (const wxChar* value) ; // Necessary or VC++ assumes bool! - bool operator== (const wxStringList& value) const; - bool operator!= (const wxStringList& value) const; - void operator= (const wxStringList& value) ; +#if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( bool operator== (const wxStringList& value) const ); + wxDEPRECATED( bool operator!= (const wxStringList& value) const ); + wxDEPRECATED( void operator= (const wxStringList& value) ); +#endif bool operator== (const wxList& value) const; bool operator!= (const wxList& value) const; void operator= (const wxList& value) ; @@ -218,8 +222,9 @@ public: bool GetBool() const ; wxString GetString() const ; wxList& GetList() const ; - wxStringList& GetStringList() const ; - +#if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( wxStringList& GetStringList() const ); +#endif void* GetVoidPtr() const ; wxObject* GetWxObjectPtr() ; #if wxUSE_DATETIME