From e0f5b49a0767df2288368f167afd8e1a225c36fb Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 20 Jul 2015 21:50:30 +0200
Subject: [PATCH] Fixed searching the elements in wxArrayPGProperty.

Use dedicated Index() function to search elements in wxArray instead of calling custom function.
---
 include/wx/propgrid/propgriddefs.h | 13 -------------
 src/propgrid/property.cpp          |  2 +-
 src/propgrid/propgrid.cpp          | 15 +++++++++++++++
 src/propgrid/propgridpagestate.cpp |  5 +----
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h
index d6e1c79214..ca6a5e6d23 100644
--- a/include/wx/propgrid/propgriddefs.h
+++ b/include/wx/propgrid/propgriddefs.h
@@ -321,19 +321,6 @@ WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(wxObject*, wxArrayPGObject,
                                   wxBaseArrayPtrVoid,
                                   class WXDLLIMPEXP_PROPGRID);
 
-// Utility to find if specific item is in a vector. Returns index to
-// the item, or wxNOT_FOUND if not present.
-template<typename CONTAINER, typename T>
-int wxPGFindInVector( CONTAINER vector, const T& item )
-{
-    for ( unsigned int i=0; i<vector.size(); i++ )
-    {
-        if ( vector[i] == item )
-            return (int) i;
-    }
-    return wxNOT_FOUND;
-}
-
 // -----------------------------------------------------------------------
 
 enum wxPG_GETPROPERTYVALUES_FLAGS
diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 20901cce8b..7fe26594eb 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -747,7 +747,7 @@ wxPropertyGrid* wxPGProperty::GetGrid() const
 
 int wxPGProperty::Index( const wxPGProperty* p ) const
 {
-    return wxPGFindInVector(m_children, p);
+    return m_children.Index(const_cast<wxPGProperty*>(p));
 }
 
 bool wxPGProperty::ValidateValue( wxVariant& WXUNUSED(value), wxPGValidationInfo& WXUNUSED(validationInfo) ) const
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 5937dc77c1..8ed706f8e3 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -5621,6 +5621,21 @@ void wxPropertyGrid::ClearActionTriggers( int action )
     while ( didSomething );
 }
 
+#if WXWIN_COMPATIBILITY_3_0
+// Utility to find if specific item is in a vector. Returns index to
+// the item, or wxNOT_FOUND if not present.
+template<typename CONTAINER, typename T>
+int wxPGFindInVector( CONTAINER vector, const T& item )
+{
+    for ( unsigned int i=0; i<vector.size(); i++ )
+    {
+        if ( vector[i] == item )
+            return (int) i;
+    }
+    return wxNOT_FOUND;
+}
+#endif // WXWIN_COMPATIBILITY_3_0
+
 void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
 {
     //
diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index 2444b2af8c..ad9fdc5858 100644
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -1355,10 +1355,7 @@ bool wxPropertyGridPageState::DoSetPropertyValueWxObjectPtr( wxPGProperty* p, wx
 
 bool wxPropertyGridPageState::DoIsPropertySelected( wxPGProperty* prop ) const
 {
-    if ( wxPGFindInVector(m_selection, prop) != wxNOT_FOUND )
-        return true;
-
-    return false;
+    return m_selection.Index(prop) != wxNOT_FOUND;
 }
 
 // -----------------------------------------------------------------------