Fixed broken wxMultiChoiceProperty::ValueToString()

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

diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index 250acb8bb58d5cf5c085bd057b0e0fea2b520ac2..22624ed2b872ee9fd9faf3768707d9182d5bf002 100644 (file)
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -406,7 +406,7 @@ public:
 
 protected:
 
 
 protected:
 

-    void GenerateValueAsString( wxString* target ) const;
+    void GenerateValueAsString( wxVariant& value, wxString* target ) const;

 
     // Returns translation of values into string indices.
     wxArrayInt GetValueAsIndices() const;
 
     // Returns translation of values into string indices.
     wxArrayInt GetValueAsIndices() const;

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index fb6a32b3ceab539f5fd89235119084719125eb88..7a58087922456c1a1b6f77108f8b71f81ad8ad1f 100644 (file)
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -1731,7 +1731,7 @@ wxMultiChoiceProperty::~wxMultiChoiceProperty()
 
 void wxMultiChoiceProperty::OnSetValue()
 {
 
 void wxMultiChoiceProperty::OnSetValue()
 {

-    GenerateValueAsString(&m_display);
+    GenerateValueAsString(m_value, &m_display);

 }
 
 wxString wxMultiChoiceProperty::ValueToString( wxVariant& value,
 }
 
 wxString wxMultiChoiceProperty::ValueToString( wxVariant& value,


@@ -1742,16 +1742,17 @@ wxString wxMultiChoiceProperty::ValueToString( wxVariant& value,
         return m_display;
 
     wxString s;
         return m_display;
 
     wxString s;

-    GenerateValueAsString(&s);
+    GenerateValueAsString(value, &s);

     return s;
 }
 
     return s;
 }
 

-void wxMultiChoiceProperty::GenerateValueAsString( wxString* target ) const
+void wxMultiChoiceProperty::GenerateValueAsString( wxVariant& value,
+                                                   wxString* target ) const

 {
     wxArrayString strings;
 
 {
     wxArrayString strings;
 

-    if ( m_value.GetType() == wxPG_VARIANT_TYPE_ARRSTRING )
-        strings = m_value.GetArrayString();
+    if ( value.GetType() == wxPG_VARIANT_TYPE_ARRSTRING )
+        strings = value.GetArrayString();

 
     wxString& tempStr = *target;
     unsigned int i;
 
     wxString& tempStr = *target;
     unsigned int i;