Removed wxPGProperty:GetArrIndex() in favor of GetIndexInParent()

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

diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index 54c1ad1266c23ff515bcbda83d76dd0de8fbeee6..3dab6627466b0f521e5f7496fbf80add19e9dc7a 100644 (file)
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -1605,8 +1605,6 @@ public:
     */
     double GetAttributeAsDouble( const wxString& name, double defVal ) const;
 
-    unsigned int GetArrIndex() const { return m_arrIndex; }
-
     unsigned int GetDepth() const { return (unsigned int)m_depth; }
 
     /** Gets flags as a'|' delimited string. Note that flag names are not

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 980f915cb116a109d3a7980bb66c06cb7815ec83..2fc310ebdd55706605574d6dc2d183a0b875cb68 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -1953,7 +1953,7 @@ void wxPGProperty::PrepareSubProperties()
 
             depth--;
 
-            i = nparent->GetArrIndex() + 1;
+            i = nparent->GetIndexInParent() + 1;
             nparent = nparent->GetParent();
         }
     }

diff --git a/src/propgrid/propgridiface.cpp b/src/propgrid/propgridiface.cpp
index 75bf8bdd5282719d727afd04422850a0922b177b..3609702e325d32f74c4c56f3e3d8dd69c01c7d9e 100644 (file)
--- a/src/propgrid/propgridiface.cpp
+++ b/src/propgrid/propgridiface.cpp
@@ -290,7 +290,7 @@ wxPGProperty* wxPropertyGridInterface::AppendIn( wxPGPropArg id, wxPGProperty* n
 wxPGProperty* wxPropertyGridInterface::Insert( wxPGPropArg id, wxPGProperty* property )
 {
     wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-    wxPGProperty* retp = m_pState->DoInsert(p->GetParent(), p->GetArrIndex(), property);
+    wxPGProperty* retp = m_pState->DoInsert(p->GetParent(), p->GetIndexInParent(), property);
     RefreshGrid();
     return retp;
 }

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 54ab86acb6d01646b18dc064ff7d5403e712ab1e..e74e099e8fbc25f2262b45bd9a84fa5720bac48c 100644 (file)
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -1226,7 +1226,7 @@ void wxFlagsProperty::Init()
             if ( selected )
             {
                 if ( selected->GetParent() == this )
-                    oldSel = selected->GetArrIndex();
+                    oldSel = selected->GetIndexInParent();
                 else if ( selected == this )
                     oldSel = -2;
             }