Reworked the way child properties can be added to a property that has not yet been added to a grid or page; AddChild() deprecated, now use AddPrivateChild() instead. For public children, new member functions AppendChild() and InsertChild() should do the job.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -67,11 +67,9 @@ wxFontDataProperty::wxFontDataProperty( const wxString& label, const wxString& n
|
||||
// (instead of calling SetValue) in derived (wxObject) properties.
|
||||
m_value_wxFontData << value;
|
||||
|
||||
SetParentalType(wxPG_PROP_AGGREGATE);
|
||||
|
||||
// Add extra children.
|
||||
AddChild( new wxColourProperty(_("Colour"), wxPG_LABEL,
|
||||
fontData.GetColour() ) );
|
||||
AddPrivateChild( new wxColourProperty(_("Colour"), wxPG_LABEL,
|
||||
fontData.GetColour() ) );
|
||||
}
|
||||
|
||||
wxFontDataProperty::~wxFontDataProperty () { }
|
||||
@@ -199,9 +197,8 @@ wxSizeProperty::wxSizeProperty( const wxString& label, const wxString& name,
|
||||
const wxSize& value) : wxPGProperty(label,name)
|
||||
{
|
||||
SetValueI(value);
|
||||
SetParentalType(wxPG_PROP_AGGREGATE);
|
||||
AddChild( new wxIntProperty(wxT("Width"),wxPG_LABEL,value.x) );
|
||||
AddChild( new wxIntProperty(wxT("Height"),wxPG_LABEL,value.y) );
|
||||
AddPrivateChild( new wxIntProperty(wxT("Width"),wxPG_LABEL,value.x) );
|
||||
AddPrivateChild( new wxIntProperty(wxT("Height"),wxPG_LABEL,value.y) );
|
||||
}
|
||||
|
||||
wxSizeProperty::~wxSizeProperty() { }
|
||||
@@ -236,9 +233,8 @@ wxPointProperty::wxPointProperty( const wxString& label, const wxString& name,
|
||||
const wxPoint& value) : wxPGProperty(label,name)
|
||||
{
|
||||
SetValueI(value);
|
||||
SetParentalType(wxPG_PROP_AGGREGATE);
|
||||
AddChild( new wxIntProperty(wxT("X"),wxPG_LABEL,value.x) );
|
||||
AddChild( new wxIntProperty(wxT("Y"),wxPG_LABEL,value.y) );
|
||||
AddPrivateChild( new wxIntProperty(wxT("X"),wxPG_LABEL,value.x) );
|
||||
AddPrivateChild( new wxIntProperty(wxT("Y"),wxPG_LABEL,value.y) );
|
||||
}
|
||||
|
||||
wxPointProperty::~wxPointProperty() { }
|
||||
|
Reference in New Issue
Block a user