X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aeab10d07c1f4ef78c0c9152de115fa216922e6c..d728116a27b358e5b002337d96268fb51be128eb:/src/generic/notebook.cpp diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index e33702a3d5..94170c605e 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -27,12 +27,12 @@ #pragma hdrstop #endif -#include -#include -#include -#include -#include -#include +#include "wx/string.h" +#include "wx/log.h" +#include "wx/settings.h" +#include "wx/generic/imaglist.h" +#include "wx/notebook.h" +#include "wx/dcclient.h" // ---------------------------------------------------------------------------- // macros @@ -45,7 +45,9 @@ // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) + BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) @@ -58,7 +60,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) -#endif // ============================================================================ // implementation @@ -72,7 +73,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) void wxNotebook::Init() { m_tabView = (wxNotebookTabView*) NULL; - m_pImageList = NULL; m_nSelection = -1; } @@ -128,11 +128,6 @@ wxNotebook::~wxNotebook() // ---------------------------------------------------------------------------- // wxNotebook accessors // ---------------------------------------------------------------------------- -int wxNotebook::GetPageCount() const -{ - return m_aPages.Count(); -} - int wxNotebook::GetRowCount() const { // TODO @@ -157,6 +152,7 @@ int wxNotebook::SetSelection(int nPage) return 0; } +#if 0 void wxNotebook::AdvanceSelection(bool bForward) { int nSel = GetSelection(); @@ -166,6 +162,7 @@ void wxNotebook::AdvanceSelection(bool bForward) else SetSelection(nSel == 0 ? nMax : nSel - 1); } +#endif bool wxNotebook::SetPageText(int nPage, const wxString& strText) { @@ -217,9 +214,21 @@ bool wxNotebook::SetPageImage(int nPage, int nImage) return FALSE; } -void wxNotebook::SetImageList(wxImageList* imageList) -{ - m_pImageList = imageList; +// set the size (the same for all pages) +void wxNotebook::SetPageSize(const wxSize& size) +{ + // TODO +} + +// set the padding between tabs (in pixels) +void wxNotebook::SetPadding(const wxSize& padding) +{ + // TODO +} + +// set the size of the tabs for wxNB_FIXEDWIDTH controls +void wxNotebook::SetTabSize(const wxSize& sz) +{ // TODO } @@ -234,8 +243,8 @@ bool wxNotebook::DeletePage(int nPage) if (m_nSelection != -1) { - m_aPages[m_nSelection]->Show(FALSE); - m_aPages[m_nSelection]->Lower(); + m_pages[m_nSelection]->Show(FALSE); + m_pages[m_nSelection]->Lower(); } wxNotebookPage* pPage = GetPage(nPage); @@ -245,10 +254,10 @@ bool wxNotebook::DeletePage(int nPage) m_tabView->RemoveTab((int) (long) pPage); #endif - delete m_aPages[nPage]; - m_aPages.Remove(nPage); + m_pages.Remove(pPage); + delete pPage; - if (m_aPages.GetCount() == 0) + if (m_pages.GetCount() == 0) { m_nSelection = -1; m_tabView->SetTabSelection(-1, FALSE); @@ -284,8 +293,8 @@ bool wxNotebook::RemovePage(int nPage) { wxCHECK( IS_VALID_PAGE(nPage), FALSE ); - m_aPages[nPage]->Show(FALSE); - // m_aPages[nPage]->Lower(); + m_pages[nPage]->Show(FALSE); + // m_pages[nPage]->Lower(); wxNotebookPage* pPage = GetPage(nPage); #if defined (__WIN16__) @@ -294,9 +303,9 @@ bool wxNotebook::RemovePage(int nPage) m_tabView->RemoveTab((int) (long) pPage); #endif - m_aPages.Remove(nPage); + m_pages.Remove(pPage); - if (m_aPages.GetCount() == 0) + if (m_pages.GetCount() == 0) { m_nSelection = -1; m_tabView->SetTabSelection(-1, TRUE); @@ -341,7 +350,7 @@ int wxNotebook::FindPagePosition(wxNotebookPage* page) const int nPageCount = GetPageCount(); int nPage; for ( nPage = 0; nPage < nPageCount; nPage++ ) - if (m_aPages[nPage] == page) + if (m_pages[nPage] == page) return nPage; return -1; } @@ -354,22 +363,13 @@ bool wxNotebook::DeleteAllPages() int nPageCount = GetPageCount(); int nPage; for ( nPage = 0; nPage < nPageCount; nPage++ ) - delete m_aPages[nPage]; + delete m_pages[nPage]; - m_aPages.Clear(); + m_pages.Clear(); return TRUE; } -// add a page to the notebook -bool wxNotebook::AddPage(wxNotebookPage *pPage, - const wxString& strText, - bool bSelect, - int imageId) -{ - return InsertPage(GetPageCount(), pPage, strText, bSelect, imageId); -} - // same as AddPage() but does it at given position bool wxNotebook::InsertPage(int nPage, wxNotebookPage *pPage, @@ -390,7 +390,7 @@ bool wxNotebook::InsertPage(int nPage, pPage->Show(FALSE); // save the pointer to the page - m_aPages.Insert(pPage, nPage); + m_pages.Insert(pPage, nPage); if (bSelect) { @@ -476,10 +476,10 @@ bool wxNotebook::RefreshLayout(bool force) rect.y = tabHeight + 4; rect.width = cw - 8; rect.height = ch - 4 - rect.y ; - + m_tabView->SetViewRect(rect); - m_tabView->Layout(); + m_tabView->LayoutTabs(); // Need to do it a 2nd time to get the tab height with // the new view width, since changing the view width changes the @@ -489,19 +489,19 @@ bool wxNotebook::RefreshLayout(bool force) rect.y = tabHeight + 4; rect.width = cw - 8; rect.height = ch - 4 - rect.y ; - + m_tabView->SetViewRect(rect); - m_tabView->Layout(); + m_tabView->LayoutTabs(); if (!force && (rect == oldRect)) return FALSE; // fit the notebook page to the tab control's display area - unsigned int nCount = m_aPages.Count(); + unsigned int nCount = m_pages.Count(); for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) { - wxNotebookPage *pPage = m_aPages[nPage]; + wxNotebookPage *pPage = m_pages[nPage]; if (pPage->IsShown()) { wxRect clientRect = GetAvailableClientSize(); @@ -532,7 +532,7 @@ void wxNotebook::OnSetFocus(wxFocusEvent& event) { // set focus to the currently selected page if any if ( m_nSelection != -1 ) - m_aPages[m_nSelection]->SetFocus(); + m_pages[m_nSelection]->SetFocus(); event.Skip(); } @@ -569,7 +569,7 @@ bool wxNotebook::DoPhase(int /* nPhase */) return TRUE; } -void wxNotebook::Command(wxCommandEvent& event) +void wxNotebook::Command(wxCommandEvent& WXUNUSED(event)) { wxFAIL_MSG("wxNotebook::Command not implemented"); } @@ -585,21 +585,21 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) wxASSERT( nOldSel != nSel ); // impossible if ( nOldSel != -1 ) { - m_aPages[nOldSel]->Show(FALSE); - m_aPages[nOldSel]->Lower(); + m_pages[nOldSel]->Show(FALSE); + m_pages[nOldSel]->Lower(); } - wxNotebookPage *pPage = m_aPages[nSel]; + wxNotebookPage *pPage = m_pages[nSel]; wxRect clientRect = GetAvailableClientSize(); pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height); + Refresh(); + pPage->Show(TRUE); pPage->Raise(); pPage->SetFocus(); - Refresh(); - m_nSelection = nSel; } @@ -636,7 +636,7 @@ wxRect wxNotebook::GetAvailableClientSize() /* * wxNotebookTabView */ - + IMPLEMENT_CLASS(wxNotebookTabView, wxTabView) wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style): wxTabView(style) @@ -658,12 +658,7 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId) if (!m_notebook) return; -// Because of name truncation! -#if defined(__BORLANDC__) && defined(__WIN16__) - wxNotebookEvent event(wxEVT_COMMAND_NB_PAGE_CHANGED, m_notebook->GetId()); -#else wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId()); -#endif #if defined (__WIN16__) int activatePos = activateId;