removing dependancy on mac headers from public wx headers (eventually adding wx/mac...

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

diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp
index 0a9993361c4f0e76026753f2f65d67f822d1d0b1..ccc78efd571a3f26b6bb13e006704ebde51a7ffd 100644 (file)
--- a/src/common/nbkbase.cpp
+++ b/src/common/nbkbase.cpp
@@ -98,7 +98,7 @@ wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage)
     {
         sizeTotal.x += 90;
 #ifdef __WXMAC__
     {
         sizeTotal.x += 90;
 #ifdef __WXMAC__

-        sizeTotal.y += 15;
+        sizeTotal.y += 28;

 #else
         sizeTotal.y += 10;
 #endif
 #else
         sizeTotal.y += 10;
 #endif


@@ -106,11 +106,12 @@ wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage)
     else
     {
 #ifdef __WXMAC__
     else
     {
 #ifdef __WXMAC__

-        sizeTotal.x += 28;   // This is correct for Aqua.
+        sizeTotal.x += 34;   // This is OK for Aqua.
+        sizeTotal.y += 46;

 #else
         sizeTotal.x += 10;
 #else
         sizeTotal.x += 10;

-#endif

         sizeTotal.y += 40;
         sizeTotal.y += 40;

+#endif

     }
 
     return sizeTotal;
     }
 
     return sizeTotal;