Remove redundant GetValueRef() from wxVariantData impl macro

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h
index 97cde0852aa6be97f1138b5e26da39815a9e0dfa..f6608cef06b09828b6ae6c84d25f1bac1aaa4ffc 100644 (file)
--- a/include/wx/propgrid/propgriddefs.h
+++ b/include/wx/propgrid/propgriddefs.h
@@ -522,16 +522,14 @@ public:\
     classname##VariantData( const classname &value ) { m_value = value; } \
 \
     classname &GetValue() { return m_value; } \
     classname##VariantData( const classname &value ) { m_value = value; } \
 \
     classname &GetValue() { return m_value; } \

+\
+    const classname &GetValue() const { return m_value; } \

 \
     virtual bool Eq(wxVariantData& data) const; \
 \
     virtual wxString GetType() const; \
 \
     virtual wxVariantData* Clone() const { return new classname##VariantData(m_value); } \
 \
     virtual bool Eq(wxVariantData& data) const; \
 \
     virtual wxString GetType() const; \
 \
     virtual wxVariantData* Clone() const { return new classname##VariantData(m_value); } \

-\
-    classname& GetValueRef() { return m_value; } \
-\
-    const classname& GetValueRef() const { return m_value; } \

 \
 protected:\
     classname m_value; \
 \
 protected:\
     classname m_value; \


@@ -561,13 +559,13 @@ expdecl classname& classname##RefFromVariant( wxVariant& variant ) \
 { \
     wxASSERT( variant.GetType() == #classname );\
     classname##VariantData *data = (classname##VariantData*) variant.GetData();\
 { \
     wxASSERT( variant.GetType() == #classname );\
     classname##VariantData *data = (classname##VariantData*) variant.GetData();\

-    return data->GetValueRef();\
+    return data->GetValue();\

 } \
 expdecl const classname& classname##RefFromVariant( const wxVariant& variant ) \
 { \
     wxASSERT( variant.GetType() == #classname );\
     classname##VariantData *data = (classname##VariantData*) variant.GetData();\
 } \
 expdecl const classname& classname##RefFromVariant( const wxVariant& variant ) \
 { \
     wxASSERT( variant.GetType() == #classname );\
     classname##VariantData *data = (classname##VariantData*) variant.GetData();\

-    return data->GetValueRef();\
+    return data->GetValue();\

 }
 
 // implements a wxVariantData-derived class using for the Eq() method the
 }
 
 // implements a wxVariantData-derived class using for the Eq() method the