X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60ec3e58b834a230e1d2d364cdfe6e20f3cb604f..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/nbkbase.cpp?ds=sidebyside diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp index 527fcc27db..ec391bb57f 100644 --- a/src/common/nbkbase.cpp +++ b/src/common/nbkbase.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "notebookbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -33,71 +29,28 @@ #ifndef WX_PRECOMP #endif //WX_PRECOMP -#include "wx/imaglist.h" #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) ) + + if ( HasFlag(wxBK_LEFT) || HasFlag(wxBK_RIGHT) ) { sizeTotal.x += 90; sizeTotal.y += 10; } - else + else // tabs on top/bottom side { sizeTotal.x += 10; sizeTotal.y += 40; @@ -107,53 +60,25 @@ wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) } // ---------------------------------------------------------------------------- -// pages management +// events // ---------------------------------------------------------------------------- -bool wxNotebookBase::DeletePage(int nPage) +bool wxNotebookBase::SendPageChangingEvent(int nPage) { - wxNotebookPage *page = DoRemovePage(nPage); - if ( !page ) - return FALSE; - - delete page; - - return TRUE; + wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId()); + event.SetSelection(nPage); + event.SetOldSelection(GetSelection()); + event.SetEventObject(this); + return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed(); } -wxNotebookPage *wxNotebookBase::DoRemovePage(int nPage) +void wxNotebookBase::SendPageChangedEvent(int nPageOld, int nPageNew) { - wxCHECK_MSG( nPage >= 0 && (size_t)nPage < m_pages.GetCount(), NULL, - _T("invalid page index in wxNotebookBase::DoRemovePage()") ); - - wxNotebookPage *pageRemoved = m_pages[nPage]; - m_pages.RemoveAt(nPage); - - return pageRemoved; -} - -int wxNotebookBase::GetNextPage(bool forward) const -{ - int nPage; - - int nMax = GetPageCount(); - if ( nMax-- ) // decrement it to get the last valid index - { - int nSel = GetSelection(); - - // change selection wrapping if it becomes invalid - nPage = forward ? nSel == nMax ? 0 - : nSel + 1 - : nSel == 0 ? nMax - : nSel - 1; - } - else // notebook is empty, no next page - { - nPage = -1; - } - - return nPage; + wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, GetId()); + event.SetSelection(nPageNew == -1 ? GetSelection() : nPageNew); + event.SetOldSelection(nPageOld); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); } #endif // wxUSE_NOTEBOOK -