From 233387bdcbb1c4f31c54b0fe6b3f03e8d261cab1 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 30 Jan 2006 15:19:48 +0000
Subject: [PATCH] Separated out book control sizing code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/bookctrl.h   |  3 +++
 src/common/bookctrl.cpp | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 171366205f..71d1a39283 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -207,6 +207,9 @@ protected:
     // Always rely on GetBestSize, which will look at all the pages
     virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
 
+    // Lay out controls
+    void DoSize();
+
     // the array of all pages of this control
     wxArrayPages m_pages;
 
diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 2431b05ac5..63f34b0d7b 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -252,10 +252,9 @@ wxRect wxBookCtrlBase::GetPageRect() const
     return rectPage;
 }
 
-void wxBookCtrlBase::OnSize(wxSizeEvent& event)
+// Lay out controls
+void wxBookCtrlBase::DoSize()
 {
-    event.Skip();
-
     if ( !m_bookctrl )
     {
         // we're not fully created yet or OnSize() should be hidden by derived class
@@ -303,6 +302,13 @@ void wxBookCtrlBase::OnSize(wxSizeEvent& event)
     }
 }
 
+void wxBookCtrlBase::OnSize(wxSizeEvent& event)
+{
+    event.Skip();
+    
+    DoSize();
+}
+
 wxSize wxBookCtrlBase::GetControllerSize() const
 {
     if(!m_bookctrl)
-- 
2.45.2