ugly fix for warnings when wxUSE_STL==0 not breaking compilation when wxUSE_STL==1

[wxWidgets.git] / src / common / nbkbase.cpp

diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp
index ccc78efd571a3f26b6bb13e006704ebde51a7ffd..fcfd478e7c0c35f2d13837ad98490402c9195b2d 100644 (file)
--- a/src/common/nbkbase.cpp
+++ b/src/common/nbkbase.cpp
@@ -36,6 +36,16 @@
 #include "wx/imaglist.h"
 #include "wx/notebook.h"
 
 #include "wx/imaglist.h"
 #include "wx/notebook.h"
 

+#ifdef __GNUWIN32_OLD__
+    #include "wx/msw/gnuwin32/extra.h"
+#endif
+
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
+#include "wx/msw/private.h"
+#include <commctrl.h>
+#include "wx/msw/winundef.h"
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -86,37 +96,49 @@ void wxNotebookBase::AssignImageList(wxImageList* imageList)
 // geometry
 // ----------------------------------------------------------------------------
 
 // geometry
 // ----------------------------------------------------------------------------
 

-wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage)
+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;
     wxSize sizeTotal = sizePage;

-    
-    // Mac has large notebook borders.

 
     if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
     {
         sizeTotal.x += 90;
 
     if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
     {
         sizeTotal.x += 90;

-#ifdef __WXMAC__
-        sizeTotal.y += 28;
-#else

         sizeTotal.y += 10;
         sizeTotal.y += 10;

-#endif

     }
     }

-    else
+    else // tabs on top/bottom side

     {
     {

-#ifdef __WXMAC__
-        sizeTotal.x += 34;   // This is OK for Aqua.
-        sizeTotal.y += 46;
-#else

         sizeTotal.x += 10;
         sizeTotal.y += 40;
         sizeTotal.x += 10;
         sizeTotal.y += 40;

-#endif

     }
 
     return sizeTotal;
 }
 
     }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // pages management
 // ----------------------------------------------------------------------------