X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..db6d3918916e601fe06b9fbffc2969d57e5e68f2:/src/common/bookctrl.cpp diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp index b04136183e..f22559cb98 100644 --- a/src/common/bookctrl.cpp +++ b/src/common/bookctrl.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/bookctrl.cpp -// Purpose: wxBookCtrl implementation +// Name: src/common/bookctrl.cpp +// Purpose: wxBookCtrlBase implementation // Author: Vadim Zeitlin // Modified by: // Created: 19.08.03 @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "bookctrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -38,18 +34,36 @@ // implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// event table +// ---------------------------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxBookCtrlBase, wxControl) + +BEGIN_EVENT_TABLE(wxBookCtrlBase, wxControl) + EVT_SIZE(wxBookCtrlBase::OnSize) +END_EVENT_TABLE() + // ---------------------------------------------------------------------------- // constructors and destructors // ---------------------------------------------------------------------------- -void wxBookCtrl::Init() +void wxBookCtrlBase::Init() { + m_bookctrl = NULL; m_imageList = NULL; m_ownsImageList = false; + m_fitToCurrentPage = false; + +#if defined(__WXWINCE__) + m_internalBorder = 1; +#else + m_internalBorder = 5; +#endif } bool -wxBookCtrl::Create(wxWindow *parent, +wxBookCtrlBase::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -68,7 +82,7 @@ wxBookCtrl::Create(wxWindow *parent, ); } -wxBookCtrl::~wxBookCtrl() +wxBookCtrlBase::~wxBookCtrlBase() { if ( m_ownsImageList ) { @@ -81,7 +95,7 @@ wxBookCtrl::~wxBookCtrl() // image list // ---------------------------------------------------------------------------- -void wxBookCtrl::SetImageList(wxImageList *imageList) +void wxBookCtrlBase::SetImageList(wxImageList *imageList) { if ( m_ownsImageList ) { @@ -94,7 +108,7 @@ void wxBookCtrl::SetImageList(wxImageList *imageList) m_imageList = imageList; } -void wxBookCtrl::AssignImageList(wxImageList* imageList) +void wxBookCtrlBase::AssignImageList(wxImageList* imageList) { SetImageList(imageList); @@ -105,12 +119,12 @@ void wxBookCtrl::AssignImageList(wxImageList* imageList) // geometry // ---------------------------------------------------------------------------- -void wxBookCtrl::SetPageSize(const wxSize& size) +void wxBookCtrlBase::SetPageSize(const wxSize& size) { SetClientSize(CalcSizeFromPage(size)); } -wxSize wxBookCtrl::DoGetBestSize() const +wxSize wxBookCtrlBase::DoGetBestSize() const { wxSize bestSize; @@ -118,19 +132,27 @@ wxSize wxBookCtrl::DoGetBestSize() const const size_t nCount = m_pages.size(); for ( size_t nPage = 0; nPage < nCount; nPage++ ) { - wxWindow *pPage = m_pages[nPage]; - wxSize childBestSize(pPage->GetBestSize()); + const wxWindow * const pPage = m_pages[nPage]; + if( pPage ) + { + wxSize childBestSize(pPage->GetBestSize()); - if ( childBestSize.x > bestSize.x ) - bestSize.x = childBestSize.x; + if ( childBestSize.x > bestSize.x ) + bestSize.x = childBestSize.x; - if ( childBestSize.y > bestSize.y ) - bestSize.y = childBestSize.y; + if ( childBestSize.y > bestSize.y ) + bestSize.y = childBestSize.y; + } } + + if (m_fitToCurrentPage && GetCurrentPage()) + bestSize = GetCurrentPage()->GetBestSize(); - // convert display area to window area, adding the size neccessary for the + // convert display area to window area, adding the size necessary for the // tabs - return CalcSizeFromPage(bestSize); + wxSize best = CalcSizeFromPage(bestSize); + CacheBestSize(best); + return best; } // ---------------------------------------------------------------------------- @@ -138,44 +160,48 @@ wxSize wxBookCtrl::DoGetBestSize() const // ---------------------------------------------------------------------------- bool -wxBookCtrl::InsertPage(size_t nPage, - wxWindow *page, - const wxString& WXUNUSED(text), - bool WXUNUSED(bSelect), - int WXUNUSED(imageId)) +wxBookCtrlBase::InsertPage(size_t nPage, + wxWindow *page, + const wxString& WXUNUSED(text), + bool WXUNUSED(bSelect), + int WXUNUSED(imageId)) { - wxCHECK_MSG( page, false, _T("NULL page in wxBookCtrl::InsertPage()") ); + wxCHECK_MSG( page || AllowNullPage(), false, + _T("NULL page in wxBookCtrlBase::InsertPage()") ); wxCHECK_MSG( nPage <= m_pages.size(), false, - _T("invalid page index in wxBookCtrl::InsertPage()") ); + _T("invalid page index in wxBookCtrlBase::InsertPage()") ); m_pages.Insert(page, nPage); + InvalidateBestSize(); return true; } -bool wxBookCtrl::DeletePage(size_t nPage) +bool wxBookCtrlBase::DeletePage(size_t nPage) { wxWindow *page = DoRemovePage(nPage); - if ( !page ) + if ( !(page || AllowNullPage()) ) return false; + // delete NULL is harmless delete page; return true; } -wxWindow *wxBookCtrl::DoRemovePage(size_t nPage) +wxWindow *wxBookCtrlBase::DoRemovePage(size_t nPage) { wxCHECK_MSG( nPage < m_pages.size(), NULL, - _T("invalid page index in wxBookCtrl::DoRemovePage()") ); + _T("invalid page index in wxBookCtrlBase::DoRemovePage()") ); wxWindow *pageRemoved = m_pages[nPage]; m_pages.RemoveAt(nPage); + InvalidateBestSize(); return pageRemoved; } -int wxBookCtrl::GetNextPage(bool forward) const +int wxBookCtrlBase::GetNextPage(bool forward) const { int nPage; @@ -192,11 +218,124 @@ int wxBookCtrl::GetNextPage(bool forward) const } else // notebook is empty, no next page { - nPage = -1; + nPage = wxNOT_FOUND; } return nPage; } -#endif // wxUSE_BOOKCTRL +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