wxPropertyGridPageState::wxPropertyGridPageState()
{
- m_pPropGrid = (wxPropertyGrid*) NULL;
+ m_pPropGrid = NULL;
m_regularArray.SetParentState(this);
m_properties = &m_regularArray;
- m_abcArray = (wxPGRootProperty*) NULL;
- m_currentCategory = (wxPropertyCategory*) NULL;
- m_selected = (wxPGProperty*) NULL;
+ m_abcArray = NULL;
+ m_currentCategory = NULL;
+ m_selected = NULL;
m_width = 0;
m_virtualHeight = 0;
m_lastCaptionBottomnest = 1;
{
if ( !m_abcArray )
{
- m_abcArray = new wxPGRootProperty();
+ m_abcArray = new wxPGRootProperty(wxS("<Root_NonCat>"));
m_abcArray->SetParentState(this);
m_abcArray->SetFlag(wxPG_PROP_CHILDREN_ARE_COPIES);
}
m_dictName.clear();
- m_currentCategory = (wxPropertyCategory*) NULL;
+ m_currentCategory = NULL;
m_lastCaptionBottomnest = 1;
m_itemsAdded = 0;
m_virtualHeight = 0;
m_vhCalcPending = 0;
- m_selected = (wxPGProperty*) NULL;
+ m_selected = NULL;
}
// -----------------------------------------------------------------------
wxPGProperty* wxPropertyGridPageState::GetLastItem( int flags )
{
if ( !m_properties->GetChildCount() )
- return (wxPGProperty*) NULL;
+ return NULL;
wxPG_ITERATOR_CREATE_MASKS(flags, int itemExMask, int parentExMask)
return (wxPropertyCategory*)parent;
} while ( grandparent );
- return (wxPropertyCategory*) NULL;
+ return NULL;
}
// -----------------------------------------------------------------------
it = m_dictName.find(name);
if ( it != m_dictName.end() )
return (wxPGProperty*) it->second;
- return (wxPGProperty*) NULL;
+ return NULL;
}
// -----------------------------------------------------------------------
#define ITEM_ITERATION_INIT(startparent, startindex, state) \
parent = startparent; \
i = (unsigned int)startindex; \
- if ( parent == (wxPGProperty*) NULL ) \
+ if ( parent == NULL ) \
{ \
parent = state->m_properties; \
i = 0; \
#endif
void wxPropertyGridPageState::DoSortChildren( wxPGProperty* p,
- bool recursively )
+ int flags )
{
if ( !p )
p = m_properties;
+ // Can only sort items with children
if ( !p->GetChildCount() )
return;
- // Can only sort items with children
- if ( p->GetChildCount() < 1 )
+ // Never sort children of aggregate properties
+ if ( p->HasFlag(wxPG_PROP_AGGREGATE) )
+ return;
+
+ if ( (flags & wxPG_SORT_TOP_LEVEL_ONLY)
+ && !p->IsCategory() && !p->IsRoot() )
return;
#if wxUSE_STL
p->m_children.Sort( wxPG_SortFunc_ByLabel );
#endif
- // Fix indexes
+ // Fix indices
p->FixIndicesOfChildren();
- if ( recursively && !p->HasFlag(wxPG_PROP_AGGREGATE) )
+ if ( flags & wxPG_RECURSE )
{
+ // Apply sort recursively
for ( unsigned int i=0; i<p->GetChildCount(); i++ )
- DoSortChildren(p->Item(i));
+ DoSortChildren(p->Item(i), flags);
}
}
// -----------------------------------------------------------------------
-void wxPropertyGridPageState::DoSort()
+void wxPropertyGridPageState::DoSort( int flags )
{
- DoSortChildren( m_properties, true );
+ DoSortChildren( m_properties, flags | wxPG_RECURSE );
- // Sort categories as well (but we need not do it recursively)
- if ( !IsInNonCatMode() )
- {
- size_t i;
- for ( i=0;i<m_properties->GetChildCount();i++)
- {
- wxPGProperty* p = m_properties->Item(i);
- if ( p->IsCategory() )
- DoSortChildren( p );
- }
- }
+ // We used to sort categories as well here also if in non-categorized
+ // mode, but doing would naturally cause child indices to become
+ // corrupted.
+}
+
+// -----------------------------------------------------------------------
+
+bool wxPropertyGridPageState::PrepareAfterItemsAdded()
+{
+ if ( !m_itemsAdded ) return false;
+
+ wxPropertyGrid* pg = GetGrid();
+
+ m_itemsAdded = 0;
+
+ if ( pg->HasFlag(wxPG_AUTO_SORT) )
+ DoSort(wxPG_SORT_TOP_LEVEL_ONLY);
+
+ return true;
}
// -----------------------------------------------------------------------
{
// Outside?
if ( y < 0 )
- return (wxPGProperty*) NULL;
+ return NULL;
unsigned int a = 0;
return m_properties->GetItemAtY(y, GetGrid()->m_lineHeight, &a);
return false;
}
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::DoSetPropertyValueUnspecified( wxPGProperty* p )
-{
- wxCHECK_RET( p, wxT("invalid property id") );
-
- if ( !p->IsValueUnspecified() )
- {
- // Value should be set first - editor class methods may need it
- p->m_value.MakeNull();
-
- wxASSERT( m_pPropGrid );
-
- if ( m_pPropGrid->GetState() == this )
- {
- if ( m_pPropGrid->m_selected == p && m_pPropGrid->m_wndEditor )
- {
- p->GetEditorClass()->SetValueToUnspecified(p, m_pPropGrid->GetEditorControl());
- }
- }
-
- unsigned int i;
- for ( i = 0; i < p->GetChildCount(); i++ )
- DoSetPropertyValueUnspecified( p->Item(i) );
- }
-}
-
// -----------------------------------------------------------------------
// wxPropertyGridPageState property operations
// -----------------------------------------------------------------------
if ( wxStrcmp(current->GetType(), wxS("list")) == 0 )
{
DoSetPropertyValues( current->GetList(),
- p->IsCategory()?p:((wxPGProperty*)NULL)
+ p->IsCategory()?p:(NULL)
);
}
else
// This will allow better behavior.
if ( scheduledParent == m_properties )
- scheduledParent = (wxPGProperty*) NULL;
+ scheduledParent = NULL;
if ( scheduledParent && !scheduledParent->IsCategory() )
{
{
wxPropertyCategory* cur_cat = m_currentCategory;
if ( property->IsCategory() )
- cur_cat = (wxPropertyCategory*) NULL;
+ cur_cat = NULL;
return DoInsert( cur_cat, -1, property );
}
if ( !res )
return m_currentCategory;
+ bool parentIsRoot = parent->IsRoot();
+ bool parentIsCategory = parent->IsCategory();
+
// Note that item must be added into current mode later.
// If parent is wxParentProperty, just stick it in...
// 1) Add to given category in given index.
// 2) Add as last item in m_abcArray.
- if ( !parent->IsCategory() && !parent->IsRoot() )
+ if ( m_properties == &m_regularArray )
{
- // Parent is wxParentingProperty: Just stick it in...
- parent->AddChild2( property, index );
- }
- else
- {
- // Parent is Category or Root.
+ // We are currently in Categorized mode
- if ( m_properties == &m_regularArray )
+ // Only add non-categories to m_abcArray.
+ if ( m_abcArray && !property->IsCategory() &&
+ (parentIsCategory || parentIsRoot) )
{
- // Categorized mode
-
- // Only add non-categories to m_abcArray.
- if ( m_abcArray && !property->IsCategory() )
- m_abcArray->AddChild2( property, -1, false );
-
- // Add to current mode.
- parent->AddChild2( property, index );
-
+ m_abcArray->AddChild2( property, -1, false );
}
- else
- {
- // Non-categorized mode.
-
- if ( parent != m_properties )
- // Parent is category.
- parent->AddChild2( property, index, false );
- else
- // Parent is root.
- m_regularArray.AddChild2( property, -1, false );
- // Add to current mode (no categories).
- if ( !property->IsCategory() )
- m_abcArray->AddChild2( property, index );
- }
+ // Add to current mode.
+ parent->AddChild2( property, index, true );
+ }
+ else
+ {
+ // We are currently in Non-categorized/Alphabetic mode
+
+ if ( parentIsCategory )
+ // Parent is category.
+ parent->AddChild2( property, index, false );
+ else if ( parentIsRoot )
+ // Parent is root.
+ m_regularArray.AddChild2( property, -1, false );
+
+ // Add to current mode
+ if ( !property->IsCategory() )
+ m_abcArray->AddChild2( property, index, true );
}
// category stuff
// Only add name to hashmap if parent is root or category
if ( property->m_name.length() &&
- (parent->IsCategory() || parent->IsRoot()) )
+ (parentIsCategory || parentIsRoot) )
m_dictName[property->m_name] = (void*) property;
VirtualHeightChanged();
if ( item->IsCategory() )
{
if ( pwc == m_currentCategory )
- m_currentCategory = (wxPropertyCategory*) NULL;
+ m_currentCategory = NULL;
}
item->DeleteChildren();
projects / wxWidgets.git / blobdiff