wxPGProperty::GenerateComposedValue() -> protected DoGenerateComposedValue(), added...

[wxWidgets.git] / include / wx / propgrid / property.h

diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index 13ba5c5be87438ef3789aca981defcadd127fccc..8a087be51e7c88ebd6dbc0c5f1e6a871abc91781 100644 (file)
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -1390,13 +1390,14 @@ public:
     }
 
     /**
-        Composes text from values of child properties. You usually do not have
-        to care about arguments other than 'text'.
+        Composes text from values of child properties.
     */
-    void GenerateComposedValue( wxString& text,
-                                int argFlags = wxPG_VALUE_IS_CURRENT,
-                                const wxVariantList* valueOverrides = NULL,
-                                wxPGHashMapS2S* childResults = NULL ) const;
+    wxString GenerateComposedValue() const
+    {
+        wxString s;
+        DoGenerateComposedValue(s);
+        return s;
+    }
 
     /** Returns property's label. */
     const wxString& GetLabel() const { return m_label; }
@@ -2054,6 +2055,11 @@ protected:
                     int index = -1,
                     bool correct_mode = true );
 
+    void DoGenerateComposedValue( wxString& text,
+                                  int argFlags = wxPG_VALUE_IS_CURRENT,
+                                  const wxVariantList* valueOverrides = NULL,
+                                  wxPGHashMapS2S* childResults = NULL ) const;
+
     void DoSetName(const wxString& str) { m_name = str; }
 
     void InitAfterAdded( wxPropertyGridPageState* pageState,