Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxPGProperty::GenerateComposedValue() -> protected DoGenerateComposedValue(), added simple public GenerateComposedValue()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-10-17 16:46:38 +00:00
parent 157a8f7002
commit c82a80e81f
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/propgrid/property.h
View File

@@ -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,