Removed GetExpandedProperties() (used to act as poor man's GetEditableState())

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 469cbed56a245fe8d0a5cf433c3acf57431ad445..05592dca15430a6f34361d91dd100dbb48b7b9fd 100644 (file)
--- 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 17fa4f2a3b925eddeadc276eb1628e002efc6c37..72e7d41f2f167e1ccd7f9ac5831ec64b62335650 100644 (file)
--- 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 4802c840fd903d44524bcc5a0cd72425c891a27b..f8d146f76aef168756b0b721d66b4d47c61d0853 100644 (file)
--- 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; i<properties.size(); i++ )
-        names->Add( properties[i]->GetName() );
-}
-
-static void NamesToProperties( wxPropertyGridInterface* iface,
-                               wxArrayPGProperty* properties,
-                               const wxArrayString& names )
-{
-    unsigned int i;
-    for ( i=0; i<names.size(); i++ )
-    {
-        wxPGProperty* p = iface->GetPropertyByName(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; i<array.size(); i++ )
-        {
-            wxPGProperty* p = array[i];
-            if ( !p->IsKindOf(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; i<array2.size(); i++ )
-        {
-            wxPGProperty* p = array[i];
-            p->SetExpanded(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