From da817fa6ebbe54afe26b7536255699294abe4dfd Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 6 Feb 2006 17:51:11 +0000
Subject: [PATCH] Changed function to SetFitToCurrentPage

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

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index ea8784a5db..5d09ad2d9a 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -132,8 +132,8 @@ public:
     bool IsVertical() const { return HasFlag(wxBK_BOTTOM | wxBK_TOP); }
 
     // set/get option to shrink to fit current page
-    void SetShrinkMode(bool shrink) { m_shrinkToFit = shrink; }
-    bool GetShrinkMode() const { return m_shrinkToFit; }
+    void SetFitToCurrentPage(bool fit) { m_fitToCurrentPage = fit; }
+    bool GetFitToCurrentPage() const { return m_fitToCurrentPage; }
 
     // operations
     // ----------
@@ -234,7 +234,7 @@ protected:
     wxControl *m_bookctrl;
 
     // Whether to shrink to fit current page
-    bool m_shrinkToFit;
+    bool m_fitToCurrentPage;
 
 private:
 
diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index b0a8dea974..f22559cb98 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -53,7 +53,7 @@ void wxBookCtrlBase::Init()
     m_bookctrl = NULL;
     m_imageList = NULL;
     m_ownsImageList = false;
-    m_shrinkToFit = false;
+    m_fitToCurrentPage = false;
 
 #if defined(__WXWINCE__)
     m_internalBorder = 1;
@@ -145,7 +145,7 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
         }
     }
     
-    if (m_shrinkToFit && GetCurrentPage())
+    if (m_fitToCurrentPage && GetCurrentPage())
         bestSize = GetCurrentPage()->GetBestSize();
 
     // convert display area to window area, adding the size necessary for the
diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 5de4cacead..80b24e73f8 100644
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -164,7 +164,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
         bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
     
     if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
-        bookCtrl->SetShrinkMode(true);
+        bookCtrl->SetFitToCurrentPage(true);
     
     return bookCtrl;
 }
-- 
2.45.2