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

Use getter methods to get access to wxPGProperty member variables.

Browse Source 
Use GetValueImage() getter to get access to m_valueBitmap data member.
Use GetMaxLength() getter to get access to m_maxLen data member.
Use GetAttributes() getter to get access to m_attributes data member.
Use GetChoices() to get access to m_choices data member.
Use GetDepth() to get access to m_depth member variable.
Use GetBaseName() method to get access to m_name data member
Use GetLabel() method to get access to m_label member variable.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek
2015-01-31 21:45:24 +00:00
parent 9698181b45
commit da0f4ce29e
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/propgrid/propgridpagestate.cpp
View File

@@ -478,7 +478,7 @@ wxPGProperty* wxPropertyGridPageState::BaseGetPropertyByLabel
for ( size_t i=0; i<parent->GetChildCount(); i++ )
{
wxPGProperty* p = parent->Item(i);
if ( p->m_label == label )
if ( p->GetLabel() == label )
return p;
// Check children recursively.
if ( p->GetChildCount() )
@@ -813,7 +813,7 @@ int wxPropertyGridPageState::GetColumnFitWidth(wxClientDC& dc,
p->GetDisplayInfo(col, -1, 0, &text, (wxPGCell*)NULL);
dc.GetTextExtent(text, &w, &h);
if ( col == 0 )
w += ( ((int)p->m_depth-1) * pg->m_subgroup_extramargin );
w += ( (p->GetDepth()-1) * pg->m_subgroup_extramargin );
// account for the bitmap
if ( col == 1 )
@@ -849,7 +849,7 @@ int wxPropertyGridPageState::GetColumnFullWidth( wxClientDC &dc, wxPGProperty *p
int w = dc.GetTextExtent(text).x;
if ( col == 0 )
w += (int)p->m_depth * m_pPropGrid->m_subgroup_extramargin;
w += p->GetDepth() * m_pPropGrid->m_subgroup_extramargin;
// account for the bitmap
if ( col == 1 )
@@ -1507,9 +1507,9 @@ wxVariant wxPropertyGridPageState::DoGetPropertyValues( const wxString& listname
}
else
{
v.Append( DoGetPropertyValues(p->m_name,p,flags|wxPG_KEEP_STRUCTURE) );
v.Append( DoGetPropertyValues(p->GetBaseName(),p,flags|wxPG_KEEP_STRUCTURE) );
}
if ( (flags & wxPG_INC_ATTRIBUTES) && p->m_attributes.GetCount() )
if ( (flags & wxPG_INC_ATTRIBUTES) && p->GetAttributes().GetCount() )
v.Append( p->GetAttributesAsList() );
}
}
@@ -1528,7 +1528,7 @@ wxVariant wxPropertyGridPageState::DoGetPropertyValues( const wxString& listname
wxVariant variant = p->GetValue();
variant.SetName( p->GetName() );
v.Append( variant );
if ( (flags & wxPG_INC_ATTRIBUTES) && p->m_attributes.GetCount() )
if ( (flags & wxPG_INC_ATTRIBUTES) && p->GetAttributes().GetCount() )
v.Append( p->GetAttributesAsList() );
}
}
@@ -1854,9 +1854,9 @@ wxPGProperty* wxPropertyGridPageState::DoInsert( wxPGProperty* parent, int index
}
// Only add name to hashmap if parent is root or category
if ( !property->m_name.empty() &&
if ( !property->GetBaseName().empty() &&
(parentIsCategory || parentIsRoot) )
m_dictName[property->m_name] = (void*) property;
m_dictName[property->GetBaseName()] = (void*) property;
VirtualHeightChanged();