Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed function to SetFitToCurrentPage

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-02-06 17:51:11 +00:00
parent ddec9f1eeb
commit da817fa6eb
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/bookctrl.h
View File

@@ -132,8 +132,8 @@ public:
bool IsVertical() const { return HasFlag(wxBK_BOTTOM | wxBK_TOP); } bool IsVertical() const { return HasFlag(wxBK_BOTTOM | wxBK_TOP); }
// set/get option to shrink to fit current page // set/get option to shrink to fit current page
void SetShrinkMode(bool shrink) { m_shrinkToFit = shrink; } void SetFitToCurrentPage(bool fit) { m_fitToCurrentPage = fit; }
bool GetShrinkMode() const { return m_shrinkToFit; } bool GetFitToCurrentPage() const { return m_fitToCurrentPage; }
// operations // operations
// ---------- // ----------
@@ -234,7 +234,7 @@ protected:
wxControl *m_bookctrl; wxControl *m_bookctrl;
// Whether to shrink to fit current page // Whether to shrink to fit current page
bool m_shrinkToFit; bool m_fitToCurrentPage;
private: private:

4
src/common/bookctrl.cpp
View File

@@ -53,7 +53,7 @@ void wxBookCtrlBase::Init()
m_bookctrl = NULL; m_bookctrl = NULL;
m_imageList = NULL; m_imageList = NULL;
m_ownsImageList = false; m_ownsImageList = false;
m_shrinkToFit = false; m_fitToCurrentPage = false;
#if defined(__WXWINCE__) #if defined(__WXWINCE__)
m_internalBorder = 1; m_internalBorder = 1;
@@ -145,7 +145,7 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
} }
} }
if (m_shrinkToFit && GetCurrentPage()) if (m_fitToCurrentPage && GetCurrentPage())
bestSize = GetCurrentPage()->GetBestSize(); bestSize = GetCurrentPage()->GetBestSize();
// convert display area to window area, adding the size necessary for the // convert display area to window area, adding the size necessary for the

2
src/generic/propdlg.cpp
View File

@@ -164,7 +164,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
bookCtrl->SetShrinkMode(true); bookCtrl->SetFitToCurrentPage(true);
return bookCtrl; return bookCtrl;
} }