Changed function to SetFitToCurrentPage

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

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index ea8784a5db03c4758882ff04cc211a83ede184f4..5d09ad2d9a06acce8233943b80abe5f812d4f371 100644 (file)
--- 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
     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
     // ----------
 
     // operations
     // ----------


@@ -234,7 +234,7 @@ protected:
     wxControl *m_bookctrl;
 
     // Whether to shrink to fit current page
     wxControl *m_bookctrl;
 
     // Whether to shrink to fit current page

-    bool m_shrinkToFit;
+    bool m_fitToCurrentPage;

 
 private:
 
 
 private:
 

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index b0a8dea974e337974cc2564a21c9435fc86d51fd..f22559cb9857d9094d7df8e07e8b716e7c40721b 100644 (file)
--- 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_bookctrl = NULL;
     m_imageList = NULL;
     m_ownsImageList = false;

-    m_shrinkToFit = false;
+    m_fitToCurrentPage = false;

 
 #if defined(__WXWINCE__)
     m_internalBorder = 1;
 
 #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
         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 5de4caceadcb34cd3a4be54efcecaab3d0874b79..80b24e73f84c0dd36da83fd9cb9d8289042e3202 100644 (file)
--- 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 = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
     
     if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)

-        bookCtrl->SetShrinkMode(true);
+        bookCtrl->SetFitToCurrentPage(true);

     
     return bookCtrl;
 }
     
     return bookCtrl;
 }