X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ce7af354a12de8cf0d80d27f6958c6ccd95f766..4b26b60fac70f89cf33935f78469e27536d8b614:/src/common/nbkbase.cpp

diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp
index 4b95397039..fcfd478e7c 100644
--- a/src/common/nbkbase.cpp
+++ b/src/common/nbkbase.cpp
@@ -98,21 +98,16 @@ void wxNotebookBase::AssignImageList(wxImageList* imageList)
 
 wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) const
 {
-    // this was just taken from wxNotebookSizer::CalcMin() and is, of
-    // course, totally bogus - just like the original code was
+    // this is, of course, totally bogus -- but we must do something by
+    // default because not all ports implement this
     wxSize sizeTotal = sizePage;
-    
-	// changed hajokirchhoff -- May, 31st, 2003
-	// moved the __WXMSW__ portion to wxNotebook::CalcSizeFromPage in src/msw/notebook.cpp
-	// where it really belongs.
-	// Question: Shouldn't we make wxNotebookBase::CalcSizeFromPage a pure virtual class.
-	//			 I'd like this better than this "totally bogus" code here.
+
     if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
     {
         sizeTotal.x += 90;
         sizeTotal.y += 10;
     }
-    else
+    else // tabs on top/bottom side
     {
         sizeTotal.x += 10;
         sizeTotal.y += 40;
@@ -121,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
 // ----------------------------------------------------------------------------
@@ -147,21 +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());
-	bestSize.SetWidth(max(childBestSize.GetWidth(), bestSize.GetWidth()));
-	bestSize.SetHeight(max(childBestSize.GetHeight(), bestSize.GetHeight()));
-  }
-  // 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;