From b96a14e3340e6f516d2d1b82ba09be1cacdb5ee2 Mon Sep 17 00:00:00 2001
From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Thu, 25 Sep 2008 17:04:11 +0000
Subject: [PATCH] Removed wxPGProperty:GetArrIndex() in favor of
 GetIndexInParent()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/propgrid/property.h | 2 --
 src/propgrid/property.cpp      | 2 +-
 src/propgrid/propgridiface.cpp | 2 +-
 src/propgrid/props.cpp         | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index 54c1ad1266..3dab662746 100644
--- 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 980f915cb1..2fc310ebdd 100644
--- 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 75bf8bdd52..3609702e32 100644
--- 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 54ab86acb6..e74e099e8f 100644
--- 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;
             }
-- 
2.45.2