From 42a1064ea8ce1f14c2faa93123ad2f70e1b9e808 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Mon, 19 Jan 2015 19:58:32 +0000 Subject: [PATCH] Implement deprecated wxPGProperty::GetValueString function only in wxPG 1.4 compatibility mode. This function was marked as deprecated in 2008. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/propgrid/property.h | 2 ++ src/propgrid/property.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h index 6b4290a149..2fb1f66c1b 100644 --- a/include/wx/propgrid/property.h +++ b/include/wx/propgrid/property.h @@ -1647,6 +1647,7 @@ public: */ virtual wxString GetValueAsString( int argFlags = 0 ) const; +#if wxPG_COMPATIBILITY_1_4 /** Synonymous to GetValueAsString(). @deprecated Use GetValueAsString() instead. @@ -1654,6 +1655,7 @@ public: @see GetValueAsString() */ wxDEPRECATED( wxString GetValueString( int argFlags = 0 ) const ); +#endif /** Returns wxPGCell of given column. diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp index a46e7a5aea..326f5e5155 100644 --- a/src/propgrid/property.cpp +++ b/src/propgrid/property.cpp @@ -1054,10 +1054,12 @@ wxString wxPGProperty::GetValueAsString( int argFlags ) const } } +#if wxPG_COMPATIBILITY_1_4 wxString wxPGProperty::GetValueString( int argFlags ) const { return GetValueAsString(argFlags); } +#endif bool wxPGProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argFlags) ) const {