X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/550e6c014ca85140969ab48c22c684755b4e9dce..4b26b60fac70f89cf33935f78469e27536d8b614:/src/common/nbkbase.cpp diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp index b219336aa0..fcfd478e7c 100644 --- a/src/common/nbkbase.cpp +++ b/src/common/nbkbase.cpp @@ -116,6 +116,29 @@ wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) const return sizeTotal; } +wxSize wxNotebookBase::DoGetBestSize() const +{ + wxSize bestSize; + + // iterate over all pages, get the largest width and height + const size_t nCount = m_pages.Count(); + for ( size_t nPage = 0; nPage < nCount; nPage++ ) + { + wxNotebookPage *pPage = m_pages[nPage]; + wxSize childBestSize(pPage->GetBestSize()); + + if ( childBestSize.x > bestSize.x ) + bestSize.x = childBestSize.x; + + if ( childBestSize.y > bestSize.y ) + bestSize.y = childBestSize.y; + } + + // convert display area to window area, adding the size neccessary for the + // tabs + return CalcSizeFromPage(bestSize); +} + // ---------------------------------------------------------------------------- // pages management // ---------------------------------------------------------------------------- @@ -142,28 +165,6 @@ wxNotebookPage *wxNotebookBase::DoRemovePage(int nPage) return pageRemoved; } -wxSize wxNotebookBase::DoGetBestSize() const -{ - wxSize bestSize(0,0); - size_t nCount = m_pages.Count(); - - // iterate over all pages, get the largest width and height - for ( size_t nPage = 0; nPage < nCount; nPage++ ) - { - wxNotebookPage *pPage = m_pages[nPage]; - wxSize childBestSize(pPage->GetBestSize()); - - if ( childBestSize.x > bestSize.x ) - bestSize.x = childBestSize.x; - - if ( childBestSize.y > bestSize.y ) - bestSize.y = childBestSize.y; - } - - // convert display area to window area, adding the size neccessary for the tab control itself - return CalcSizeFromPage(bestSize); -} - int wxNotebookBase::GetNextPage(bool forward) const { int nPage;