diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h index 469cbed56a..05592dca15 100644 --- a/include/wx/propgrid/propgridiface.h +++ b/include/wx/propgrid/propgridiface.h @@ -266,16 +266,6 @@ public: */ bool ExpandAll( bool expand = true ); - /** Returns list of expanded properties. - */ - wxArrayPGProperty GetExpandedProperties() const - { - wxArrayPGProperty array; - GetPropertiesWithFlag(&array, wxPG_PROP_COLLAPSED, true, - wxPG_ITERATE_ALL_PARENTS_RECURSIVELY|wxPG_ITERATE_HIDDEN); - return array; - } - /** Returns id of first child of given property. @remarks Does not return sub-properties! diff --git a/interface/wx/propgrid/propgridiface.h b/interface/wx/propgrid/propgridiface.h index 17fa4f2a3b..72e7d41f2f 100644 --- a/interface/wx/propgrid/propgridiface.h +++ b/interface/wx/propgrid/propgridiface.h @@ -157,11 +157,6 @@ public: */ bool ExpandAll( bool expand = true ); - /** - Returns list of expanded properties. - */ - wxArrayPGProperty GetExpandedProperties() const; - /** Returns id of first child of given property. diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index 4802c840fd..f8d146f76a 100644 --- a/samples/propgrid/tests.cpp +++ b/samples/propgrid/tests.cpp @@ -439,28 +439,6 @@ wxArrayPGProperty GetPropertiesInRandomOrder( wxPropertyGridInterface* props, in return arr; } -static void PropertiesToNames( wxPropertyGridInterface* WXUNUSED(iface), - wxArrayString* names, - const wxArrayPGProperty& properties ) -{ - unsigned int i; - for ( i=0; iAdd( properties[i]->GetName() ); -} - -static void NamesToProperties( wxPropertyGridInterface* iface, - wxArrayPGProperty* properties, - const wxArrayString& names ) -{ - unsigned int i; - for ( i=0; iGetPropertyByName(names[i]); - if ( p ) - properties->push_back(p); - } -} - bool FormMain::RunTests( bool fullTest, bool interactive ) { wxString t; @@ -594,50 +572,6 @@ bool FormMain::RunTests( bool fullTest, bool interactive ) } } - { - RT_START_TEST(GetPropertiesWithFlag) - - // - // Get list of expanded properties - wxArrayPGProperty array = pgman->GetExpandedProperties(); - - // Make sure list only has items with children - for ( i=0; iIsKindOf(CLASSINFO(wxPGProperty)) ) - RT_FAILURE_MSG(wxString::Format(wxT("'%s' was returned by GetExpandedProperties(), but was not a parent"),p->GetName().c_str()).c_str()); - } - - wxArrayString names; - PropertiesToNames( pgman, &names, array ); - - // - // ... and then collapse them - wxArrayPGProperty array2; - NamesToProperties( pgman, &array2, names ); - - for ( i=0; iSetExpanded(false); - } - - // Make sure everything is collapsed - wxPGVIterator it; - - for ( it = pgman->GetVIterator(wxPG_ITERATE_ALL); - !it.AtEnd(); - it.Next() ) - { - wxPGProperty* p = it.GetProperty(); - if ( p->IsExpanded() ) - RT_FAILURE_MSG(wxString::Format(wxT("'%s.%s' was expanded"),p->GetParent()->GetName().c_str(),p->GetName().c_str()).c_str()); - } - - pgman->Refresh(); - } - { // // Delete everything in reverse order