Fixed best size of wxUniv's wxNotebook.

Removed wxNotebook::DoGetBestClientSize to let wxBookCtrlBase::DoGetBestSize do its job and fix the best size of a wxNotebook (formerly when running the notebook sample the notebook was not wide enough).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 81fa7bf3a091281ec013a0faaa556da3d0d62b92..bbc4250be93b22ad252dce4559396236db2b7df2 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -130,7 +130,6 @@ protected:
     void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
 
     // resizing
     void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
 
     // resizing

-    virtual wxSize DoGetBestClientSize() const;

     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetSize(int x, int y,
                            int width, int height,

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index 44129b423b663b6b704f30fab6efe93387a4e82e..da13abe041bf90642ef23cd9380ff9d67238fc94 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -1258,34 +1258,6 @@ void wxNotebook::ScrollLastTo(size_t page)
 // wxNotebook sizing/moving
 // ----------------------------------------------------------------------------
 
 // wxNotebook sizing/moving
 // ----------------------------------------------------------------------------
 

-wxSize wxNotebook::DoGetBestClientSize() const
-{
-    // calculate the max page size
-    wxSize size;
-
-    size_t count = GetPageCount();
-    if ( count )
-    {
-        for ( size_t n = 0; n < count; n++ )
-        {
-            wxSize sizePage = m_pages[n]->GetSize();
-
-            if ( size.x < sizePage.x )
-                size.x = sizePage.x;
-            if ( size.y < sizePage.y )
-                size.y = sizePage.y;
-        }
-    }
-    else // no pages
-    {
-        // use some arbitrary default size
-        size.x =
-        size.y = 100;
-    }
-
-    return GetSizeForPage(size);
-}
-

 void wxNotebook::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x, y, width, height);
 void wxNotebook::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x, y, width, height);