From 77db639d44f9a72eee90c05a1f8c5635b09bd22b Mon Sep 17 00:00:00 2001
From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Sat, 15 Nov 2008 10:11:52 +0000
Subject: [PATCH] Fixed wxPropertyGridPage::DoSetSplitterPosition() infinite
 recursion

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/propgrid/manager.h | 7 -------
 src/propgrid/manager.cpp      | 9 ++++++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index 26ff6a8688..c3768ab07a 100644
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -166,13 +166,6 @@ protected:
                                         bool allPages = false,
                                         bool fromAutoCenter = false );
 
-    /** Propagate to other pages.
-    */
-    void DoSetSplitterPositionThisPage( int pos, int splitterColumn = 0 )
-    {
-        wxPropertyGridPageState::DoSetSplitterPosition( pos, splitterColumn );
-    }
-
     /** Page label (may be referred as name in some parts of documentation).
         Can be set in constructor, or passed in
         wxPropertyGridManager::AddPage(), but *not* in both.
diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 9c69c43d8d..96494fea55 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -210,12 +210,15 @@ void wxPropertyGridPage::SetSplitterPosition( int splitterPos, int col )
 void wxPropertyGridPage::DoSetSplitterPosition( int pos,
                                                 int splitterColumn,
                                                 bool allPages,
-                                                bool WXUNUSED(fromAutoCenter) )
+                                                bool fromAutoCenter )
 {
     if ( allPages && m_manager->GetPageCount() )
         m_manager->SetSplitterPosition( pos, splitterColumn );
     else
-        DoSetSplitterPositionThisPage( pos, splitterColumn );
+        wxPropertyGridPageState::DoSetSplitterPosition( pos,
+                                                        splitterColumn,
+                                                        allPages,
+                                                        fromAutoCenter );
 }
 
 // -----------------------------------------------------------------------
@@ -1675,7 +1678,7 @@ void wxPropertyGridManager::SetSplitterPosition( int pos, int splitterColumn )
     for ( i=0; i<GetPageCount(); i++ )
     {
         wxPropertyGridPage* page = GetPage(i);
-        page->DoSetSplitterPositionThisPage( pos, splitterColumn );
+        page->DoSetSplitterPosition( pos, splitterColumn, false );
     }
 
     m_pPropGrid->SetInternalFlag(wxPG_FL_SPLITTER_PRE_SET);
-- 
2.45.2