added wxEXEC_NOHIDE flag, modified wxExecute() to take a combination of bit flags...

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

diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp
index ccc78efd571a3f26b6bb13e006704ebde51a7ffd..527fcc27db5a4d6f8f8d02c9dca4ef821104936a 100644 (file)
--- a/src/common/nbkbase.cpp
+++ b/src/common/nbkbase.cpp
@@ -92,26 +92,15 @@ wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage)
     // course, totally bogus - just like the original code was
     wxSize sizeTotal = sizePage;
     
     // course, totally bogus - just like the original code was
     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
     {

-#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;