fix recently introduced memory leak of m_conv (bug 1466559)

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

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 992b2a67132305d469df4921fe27ac58425e3cdd..f22559cb9857d9094d7df8e07e8b716e7c40721b 100644 (file)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/bookctrl.cpp
+// Name:        src/common/bookctrl.cpp

 // Purpose:     wxBookCtrlBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxBookCtrlBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -34,14 +34,26 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// event table
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxBookCtrlBase, wxControl)
+
+BEGIN_EVENT_TABLE(wxBookCtrlBase, wxControl)
+    EVT_SIZE(wxBookCtrlBase::OnSize)
+END_EVENT_TABLE()
+

 // ----------------------------------------------------------------------------
 // constructors and destructors
 // ----------------------------------------------------------------------------
 
 void wxBookCtrlBase::Init()
 {
 // ----------------------------------------------------------------------------
 // constructors and destructors
 // ----------------------------------------------------------------------------
 
 void wxBookCtrlBase::Init()
 {

+    m_bookctrl = NULL;

     m_imageList = NULL;
     m_ownsImageList = false;
     m_imageList = NULL;
     m_ownsImageList = false;

+    m_fitToCurrentPage = false;

 
 #if defined(__WXWINCE__)
     m_internalBorder = 1;
 
 #if defined(__WXWINCE__)
     m_internalBorder = 1;


@@ -132,6 +144,9 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
                 bestSize.y = childBestSize.y;
         }
     }
                 bestSize.y = childBestSize.y;
         }
     }

+    
+    if (m_fitToCurrentPage && GetCurrentPage())
+        bestSize = GetCurrentPage()->GetBestSize();

 
     // convert display area to window area, adding the size necessary for the
     // tabs
 
     // convert display area to window area, adding the size necessary for the
     // tabs


@@ -151,7 +166,8 @@ wxBookCtrlBase::InsertPage(size_t nPage,
                            bool WXUNUSED(bSelect),
                            int WXUNUSED(imageId))
 {
                            bool WXUNUSED(bSelect),
                            int WXUNUSED(imageId))
 {

-    wxCHECK_MSG( page || AllowNullPage(), false, _T("NULL page in wxBookCtrlBase::InsertPage()") );
+    wxCHECK_MSG( page || AllowNullPage(), false,
+                 _T("NULL page in wxBookCtrlBase::InsertPage()") );

     wxCHECK_MSG( nPage <= m_pages.size(), false,
                  _T("invalid page index in wxBookCtrlBase::InsertPage()") );
 
     wxCHECK_MSG( nPage <= m_pages.size(), false,
                  _T("invalid page index in wxBookCtrlBase::InsertPage()") );
 


@@ -208,4 +224,118 @@ int wxBookCtrlBase::GetNextPage(bool forward) const
     return nPage;
 }
 
     return nPage;
 }
 

+wxRect wxBookCtrlBase::GetPageRect() const
+{
+    const wxSize size = GetControllerSize();
+
+    wxPoint pt;
+    wxRect rectPage(pt, GetClientSize());
+    switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+    {
+        default:
+            wxFAIL_MSG( _T("unexpected alignment") );
+            // fall through
+
+        case wxBK_TOP:
+            rectPage.y = size.y + GetInternalBorder();
+            // fall through
+
+        case wxBK_BOTTOM:
+            rectPage.height -= size.y + GetInternalBorder();
+            break;
+
+        case wxBK_LEFT:
+            rectPage.x = size.x + GetInternalBorder();
+            // fall through
+
+        case wxBK_RIGHT:
+            rectPage.width -= size.x + GetInternalBorder();
+            break;
+    }
+
+    return rectPage;
+}
+
+// Lay out controls
+void wxBookCtrlBase::DoSize()
+{
+    if ( !m_bookctrl )
+    {
+        // we're not fully created yet or OnSize() should be hidden by derived class
+        return;
+    }
+
+    // resize controller and the page area to fit inside our new size
+    const wxSize sizeClient( GetClientSize() ),
+                 sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ),
+                 sizeCtrl( GetControllerSize() );
+
+    m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );
+
+    const wxSize sizeNew = m_bookctrl->GetSize();
+    wxPoint posCtrl;
+    switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+    {
+        default:
+            wxFAIL_MSG( _T("unexpected alignment") );
+            // fall through
+
+        case wxBK_TOP:
+        case wxBK_LEFT:
+            // posCtrl is already ok
+            break;
+
+        case wxBK_BOTTOM:
+            posCtrl.y = sizeClient.y - sizeNew.y;
+            break;
+
+        case wxBK_RIGHT:
+            posCtrl.x = sizeClient.x - sizeNew.x;
+            break;
+    }
+
+    if ( m_bookctrl->GetPosition() != posCtrl )
+        m_bookctrl->Move(posCtrl);
+
+    // resize the currently shown page
+    if (GetSelection() != wxNOT_FOUND )
+    {
+        wxWindow *page = m_pages[GetSelection()];
+        wxCHECK_RET( page, _T("NULL page?") );
+        page->SetSize(GetPageRect());
+    }
+}
+
+void wxBookCtrlBase::OnSize(wxSizeEvent& event)
+{
+    event.Skip();
+    
+    DoSize();
+}
+
+wxSize wxBookCtrlBase::GetControllerSize() const
+{
+    if(!m_bookctrl)
+        return wxSize(0,0);
+
+    const wxSize sizeClient = GetClientSize(),
+                 sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
+                 sizeCtrl = m_bookctrl->GetBestSize() + sizeBorder;
+
+    wxSize size;
+
+    if ( IsVertical() )
+    {
+        size.x = sizeClient.x;
+        size.y = sizeCtrl.y;
+    }
+    else // left/right aligned
+    {
+        size.x = sizeCtrl.x;
+        size.y = sizeClient.y;
+    }
+
+    return size;
+}
+

 #endif // wxUSE_BOOKCTRL
 #endif // wxUSE_BOOKCTRL