Separated out book control sizing code

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

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 171366205fdf619a478779dc17ffdb6ce2bfe32c..71d1a392836def49c43b0f95dea717d6f2133e1d 100644 (file)
--- 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)) { }
 
     // 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;
 
     // the array of all pages of this control
     wxArrayPages m_pages;
 

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 2431b05ac5584f3a9506ac94b5bf6738013c0889..63f34b0d7bcedf0aba21f6dcf2a04decf421bfda 100644 (file)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -252,10 +252,9 @@ wxRect wxBookCtrlBase::GetPageRect() const
     return rectPage;
 }
 
     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
     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)
 wxSize wxBookCtrlBase::GetControllerSize() const
 {
     if(!m_bookctrl)