X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01df01eb197ae18576b05c5e19f5d42f2ca6611a..90a77e64841dfcaf37103b6411987402739baa0b:/include/wx/variant.h

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 3f92c4e234..61186b5f20 100644
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -255,14 +255,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
     // ------------------------------
@@ -379,7 +371,7 @@ expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\
 // 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,expdecl) \
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdecl) \
 \
 bool classname##VariantData::Eq(wxVariantData& data) const \
 {\
@@ -396,7 +388,7 @@ bool classname##VariantData::Eq(wxVariantData& data) const \
 #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,expdecl) \
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdecl) \
 \
 bool classname##VariantData::Eq(wxVariantData& data) const \
 {\