Applied modified form of the StdButtonSize patch.

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

diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp
index da418151d9a71990b14436105d7ea7e27fc5b33a..6beaa057ecf1b9ff1f00c9ca03c9f345c3b305ad 100644 (file)
--- a/src/common/nbkbase.cpp
+++ b/src/common/nbkbase.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "notebookbase.h"
 #endif
 
@@ -31,109 +31,36 @@
 #if wxUSE_NOTEBOOK
 
 #ifndef WX_PRECOMP
-    #include "wx/notebook.h"
-    #include "wx/imaglist.h"
 #endif //WX_PRECOMP
 
+#include "wx/notebook.h"
+
 // ============================================================================
 // implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// constructors and destructors
-// ----------------------------------------------------------------------------
-
-void wxNotebookBase::Init()
-{
-    m_imageList = NULL;
-    m_ownsImageList = FALSE;
-}
-
-wxNotebookBase::~wxNotebookBase()
-{
-    if ( m_ownsImageList )
-    {
-        // may be NULL, ok
-        delete m_imageList;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// image list
-// ----------------------------------------------------------------------------
-
-void wxNotebookBase::SetImageList(wxImageList* imageList)
-{
-    if ( m_ownsImageList )
-    {
-        // may be NULL, ok
-        delete m_imageList;
-
-        m_ownsImageList = FALSE;
-    }
-
-    m_imageList = imageList;
-}
-
-void wxNotebookBase::AssignImageList(wxImageList* imageList)
-{
-    SetImageList(imageList);
-    m_ownsImageList = TRUE;
-}
-
 // ----------------------------------------------------------------------------
 // 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;
-    if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
-        sizeTotal.x += 90;
-    else
-        sizeTotal.y += 40;
-
-    return sizeTotal;
-}
-
-// ----------------------------------------------------------------------------
-// pages management
-// ----------------------------------------------------------------------------
 
-bool wxNotebookBase::DeletePage(int nPage)
-{
-    wxNotebookPage *page = DoRemovePage(nPage);
-    if ( !page )
-        return FALSE;
-
-    delete page;
-
-    return TRUE;
-}
-
-int wxNotebookBase::GetNextPage(bool forward) const
-{
-    int nPage;
-
-    int nMax = GetPageCount();
-    if ( nMax-- ) // decrement it to get the last valid index
+    if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
     {
-        int nSel = GetSelection();
-
-        // change selection wrapping if it becomes invalid
-        nPage = forward ? nSel == nMax ? 0
-                                       : nSel + 1
-                        : nSel == 0 ? nMax
-                                    : nSel - 1;
+        sizeTotal.x += 90;
+        sizeTotal.y += 10;
     }
-    else // notebook is empty, no next page
+    else // tabs on top/bottom side
     {
-        nPage = -1;
+        sizeTotal.x += 10;
+        sizeTotal.y += 40;
     }
 
-    return nPage;
+    return sizeTotal;
 }
 
 #endif // wxUSE_NOTEBOOK