if ( GetChildCount() )
{
// Check parental flags
- wxASSERT_MSG( (m_flags & wxPG_PROP_PARENTAL_FLAGS),
- "Call SetFlag(wxPG_PROP_MISC_PARENT) or"
- "SetFlag(wxPG_PROP_AGGREGATE) before calling"
- "wxPGProperty::AddChild()." );
+ wxASSERT_MSG( ((m_flags & wxPG_PROP_PARENTAL_FLAGS) ==
+ wxPG_PROP_AGGREGATE) ||
+ ((m_flags & wxPG_PROP_PARENTAL_FLAGS) ==
+ wxPG_PROP_MISC_PARENT),
+ "wxPGProperty parental flags set incorrectly at "
+ "this time" );
if ( HasFlag(wxPG_PROP_AGGREGATE) )
{
int propagatedFlags = argFlags & (wxPG_REPORT_ERROR|wxPG_PROGRAMMATIC_VALUE);
-#ifdef __WXDEBUG__
- bool debug_print = false;
-#endif
-
-#ifdef __WXDEBUG__
- if ( debug_print )
- wxLogDebug(wxT(">> %s.StringToValue('%s')"),GetLabel().c_str(),text.c_str());
-#endif
+ wxLogTrace("propgrid",
+ wxT(">> %s.StringToValue('%s')"), GetLabel(), text);
wxString::const_iterator it = text.begin();
wxUniChar a;
wxVariant variant(child->GetValue());
wxString childName = child->GetBaseName();
- #ifdef __WXDEBUG__
- if ( debug_print )
- wxLogDebug(wxT("token = '%s', child = %s"),
- token.c_str(), childName.c_str());
- #endif
+ wxLogTrace("propgrid",
+ wxT("token = '%s', child = %s"),
+ token, childName);
// Add only if editable or setting programmatically
if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||
void wxPGProperty::SetFlagRecursively( FlagType flag, bool set )
{
- if ( set )
- SetFlag(flag);
- else
- ClearFlag(flag);
+ ChangeFlag(flag, set);
unsigned int i;
for ( i = 0; i < GetChildCount(); i++ )
wxVariant wxPGProperty::GetDefaultValue() const
{
- wxVariant defVal = GetAttribute(wxS("DefaultValue"));
+ wxVariant defVal = GetAttribute(wxPG_ATTR_DEFAULT_VALUE);
if ( !defVal.IsNull() )
return defVal;
{
wxVariant variant = m_attributes.FindValue(name);
- return wxPGVariantToInt(variant, defVal);
+ if ( variant.IsNull() )
+ return defVal;
+
+ return variant.GetLong();
}
double wxPGProperty::GetAttributeAsDouble( const wxString& name, double defVal ) const
{
- double retVal;
wxVariant variant = m_attributes.FindValue(name);
- if ( wxPGVariantToDouble(variant, &retVal) )
- return retVal;
+ if ( variant.IsNull() )
+ return defVal;
- return defVal;
+ return variant.GetDouble();
}
wxVariant wxPGProperty::GetAttributesAsList() const
}
// This is used by Insert etc.
-void wxPGProperty::AddChild2( wxPGProperty* prop, int index, bool correct_mode )
+void wxPGProperty::DoAddChild( wxPGProperty* prop, int index,
+ bool correct_mode )
{
if ( index < 0 || (size_t)index >= m_children.size() )
{
prop->m_parent = this;
}
-// This is used by properties that have fixed sub-properties
-void wxPGProperty::AddChild( wxPGProperty* prop )
+void wxPGProperty::DoPreAddChild( int index, wxPGProperty* prop )
{
wxASSERT_MSG( prop->GetBaseName().length(),
- "Property's children must have unique, non-empty names within their scope" );
+ "Property's children must have unique, non-empty "
+ "names within their scope" );
- prop->m_arrIndex = m_children.size();
- m_children.push_back( prop );
+ prop->m_arrIndex = index;
+ m_children.insert( m_children.begin()+index,
+ prop );
int custImgHeight = prop->OnMeasureImage().y;
if ( custImgHeight < 0 /*|| custImgHeight > 1*/ )
prop->m_parent = this;
}
+void wxPGProperty::AddPrivateChild( wxPGProperty* prop )
+{
+ if ( !(m_flags & wxPG_PROP_PARENTAL_FLAGS) )
+ SetParentalType(wxPG_PROP_AGGREGATE);
+
+ wxASSERT_MSG( (m_flags & wxPG_PROP_PARENTAL_FLAGS) ==
+ wxPG_PROP_AGGREGATE,
+ "Do not mix up AddPrivateChild() calls with other "
+ "property adders." );
+
+ DoPreAddChild( m_children.size(), prop );
+}
+
+#if wxPG_COMPATIBILITY_1_4
+void wxPGProperty::AddChild( wxPGProperty* prop )
+{
+ AddPrivateChild(prop);
+}
+#endif
+
+wxPGProperty* wxPGProperty::InsertChild( int index,
+ wxPGProperty* childProperty )
+{
+ if ( index < 0 )
+ index = m_children.size();
+
+ if ( m_parentState )
+ {
+ m_parentState->DoInsert(this, index, childProperty);
+ }
+ else
+ {
+ if ( !(m_flags & wxPG_PROP_PARENTAL_FLAGS) )
+ SetParentalType(wxPG_PROP_MISC_PARENT);
+
+ wxASSERT_MSG( (m_flags & wxPG_PROP_PARENTAL_FLAGS) ==
+ wxPG_PROP_MISC_PARENT,
+ "Do not mix up AddPrivateChild() calls with other "
+ "property adders." );
+
+ DoPreAddChild( index, childProperty );
+ }
+
+ return childProperty;
+}
+
void wxPGProperty::RemoveChild( wxPGProperty* p )
{
wxArrayPGProperty::iterator it;
}
if ( allChildrenSpecified )
- ChildChanged(*value, i, childValue);
+ {
+ *value = ChildChanged(*value, i, childValue);
+ }
+
n++;
if ( n == (unsigned int)list.GetCount() )
break;
return h;
}
-wxPGProperty* wxPGProperty::GetItemAtY( unsigned int y, unsigned int lh, unsigned int* nextItemY ) const
+wxPGProperty* wxPGProperty::GetItemAtY( unsigned int y,
+ unsigned int lh,
+ unsigned int* nextItemY ) const
{
wxASSERT( nextItemY );
m_children.clear();
}
+wxPGProperty* wxPGProperty::GetItemAtY( unsigned int y ) const
+{
+ unsigned int nextItem;
+ return GetItemAtY( y, GetGrid()->GetRowHeight(), &nextItem);
+}
+
void wxPGProperty::DeleteChildren()
{
wxPropertyGridPageState* state = m_parentState;
}
}
-void wxPGProperty::ChildChanged( wxVariant& WXUNUSED(thisValue),
- int WXUNUSED(childIndex),
- wxVariant& WXUNUSED(childValue) ) const
+wxVariant wxPGProperty::ChildChanged( wxVariant& WXUNUSED(thisValue),
+ int WXUNUSED(childIndex),
+ wxVariant& WXUNUSED(childValue) ) const
{
+ return wxNullVariant;
}
bool wxPGProperty::AreAllChildrenSpecified( wxVariant* pendingList ) const
wxPGRootProperty::wxPGRootProperty( const wxString& name )
: wxPGProperty()
{
-#ifdef __WXDEBUG__
m_name = name;
m_label = m_name;
-#else
- wxUnusedVar(name);
-#endif
SetParentalType(0);
m_depth = 0;
}
{
AllocExclusive();
- wxASSERT( m_data->m_refCount != 0xFFFFFFF );
+ wxASSERT( m_data->GetRefCount() != -1 );
m_data->m_items.erase(m_data->m_items.begin()+nIndex,
m_data->m_items.begin()+nIndex+count);
}
{
EnsureData();
- if ( m_data->m_refCount != 1 )
+ if ( m_data->GetRefCount() != 1 )
{
wxPGChoicesData* data = new wxPGChoicesData();
data->CopyDataFrom(m_data);
if ( data != wxPGChoicesEmptyData )
{
m_data = data;
- data->m_refCount++;
+ data->IncRef();
}
}