X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c854c7d92cd804949cd5e520a65691eb2c1e050b..86556aa099d44b170aebbb9b55059b40b1207154:/src/mac/carbon/notebmac.cpp?ds=sidebyside diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 88b1ef2ce5..52f69eb69f 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -17,14 +17,14 @@ // headers // ---------------------------------------------------------------------------- #ifdef __GNUG__ -#pragma implementation "notebook.h" + #pragma implementation "notebook.h" #endif -#include -#include -#include -#include -#include +#include "wx/string.h" +#include "wx/log.h" +#include "wx/imaglist.h" +#include "wx/notebook.h" +#include "wx/mac/uma.h" // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -32,7 +32,7 @@ // check that the page index is valid #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount())) -#ifdef __WXMAC_X__ +#ifdef __DARWIN__ // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam) const short kwxMacTabLeftMargin = 20 ; const short kwxMacTabTopMargin = 38 ; @@ -76,11 +76,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) // common part of all ctors void wxNotebook::Init() { -#ifdef __WXMAC_X__ +#ifdef __DARWIN__ m_macHorizontalBorder = 7; m_macVerticalBorder = 8; #endif - m_pImageList = NULL; m_nSelection = -1; } @@ -116,7 +115,7 @@ bool wxNotebook::Create(wxWindow *parent, MacPreControlCreate( parent , id , "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, + m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, kControlTabSmallProc , (long) this ) ; MacPostControlCreate() ; @@ -132,19 +131,26 @@ wxNotebook::~wxNotebook() // ---------------------------------------------------------------------------- // wxNotebook accessors // ---------------------------------------------------------------------------- -int wxNotebook::GetPageCount() const + +void wxNotebook::SetPadding(const wxSize& padding) { - return m_aPages.Count(); + wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); } -int wxNotebook::GetRowCount() const +void wxNotebook::SetTabSize(const wxSize& sz) { - return 1; + wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") ); +} + +void wxNotebook::SetPageSize(const wxSize& size) +{ + wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } int wxNotebook::SetSelection(int nPage) { - wxASSERT( IS_VALID_PAGE(nPage) ); + if( !IS_VALID_PAGE(nPage) ) + return m_nSelection ; ChangePage(m_nSelection, nPage); SetControlValue( m_macControl , m_nSelection + 1 ) ; @@ -152,24 +158,11 @@ int wxNotebook::SetSelection(int nPage) return m_nSelection; } -void wxNotebook::AdvanceSelection(bool bForward) -{ - if (GetPageCount() == 0) { - return; - } - int nSel = GetSelection(); - int nMax = GetPageCount() - 1; - if ( bForward ) - SetSelection(nSel == nMax ? 0 : nSel + 1); - else - SetSelection(nSel == 0 ? nMax : nSel - 1); -} - bool wxNotebook::SetPageText(int nPage, const wxString& strText) { wxASSERT( IS_VALID_PAGE(nPage) ); - wxNotebookPage *page = m_aPages[nPage]; + wxNotebookPage *page = m_pages[nPage]; page->SetLabel(strText); MacSetupTabs(); @@ -180,43 +173,37 @@ wxString wxNotebook::GetPageText(int nPage) const { wxASSERT( IS_VALID_PAGE(nPage) ); - wxNotebookPage *page = m_aPages[nPage]; + wxNotebookPage *page = m_pages[nPage]; return page->GetLabel(); } int wxNotebook::GetPageImage(int nPage) const { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") ); - // TODO - return 0; + return 0 ; } bool wxNotebook::SetPageImage(int nPage, int nImage) { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") ); - // TODO - return FALSE; -} + wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE, + _T("invalid image index in SetPageImage()") ); -void wxNotebook::SetImageList(wxImageList* imageList) -{ - m_pImageList = imageList; - // TODO + return FALSE; } // ---------------------------------------------------------------------------- // wxNotebook operations // ---------------------------------------------------------------------------- -// remove one page from the notebook -bool wxNotebook::DeletePage(int nPage) +// remove one page from the notebook, without deleting the window +wxNotebookPage* wxNotebook::DoRemovePage(int nPage) { - wxCHECK( IS_VALID_PAGE(nPage), FALSE ); - - delete m_aPages[nPage]; - m_aPages.Remove(nPage); + wxCHECK( IS_VALID_PAGE(nPage), NULL ); + wxNotebookPage* page = m_pages[nPage] ; + m_pages.RemoveAt(nPage); MacSetupTabs(); @@ -224,20 +211,9 @@ bool wxNotebook::DeletePage(int nPage) m_nSelection = GetPageCount() - 1; } if(m_nSelection >= 0) { - m_aPages[m_nSelection]->Show(true); + m_pages[m_nSelection]->Show(true); } - - return true; -} - -// remove one page from the notebook, without deleting the window -bool wxNotebook::RemovePage(int nPage) -{ - wxCHECK( IS_VALID_PAGE(nPage), FALSE ); - - m_aPages.Remove(nPage); - - return TRUE; + return page; } // remove all pages @@ -245,26 +221,12 @@ bool wxNotebook::DeleteAllPages() { // TODO: delete native widget pages - int nPageCount = GetPageCount(); - int nPage; - for ( nPage = 0; nPage < nPageCount; nPage++ ) - delete m_aPages[nPage]; - - m_aPages.Clear(); - + WX_CLEAR_ARRAY(m_pages) ; MacSetupTabs(); 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, @@ -279,7 +241,7 @@ bool wxNotebook::InsertPage(int nPage, pPage->SetLabel(strText); // save the pointer to the page - m_aPages.Insert(pPage, nPage); + m_pages.Insert(pPage, nPage); MacSetupTabs(); @@ -321,7 +283,7 @@ void wxNotebook::MacSetupTabs() Boolean enabled = true; for(int ii = 0; ii < GetPageCount(); ii++) { - page = m_aPages[ii]; + page = m_pages[ii]; info.version = 0; info.iconSuiteID = 0; #if TARGET_CARBON @@ -337,7 +299,7 @@ void wxNotebook::MacSetupTabs() } Rect bounds; GetControlBounds(m_macControl, &bounds); - InvalWindowRect(GetMacRootWindow(), &bounds); + InvalWindowRect(MacGetRootWindow(), &bounds); } // ---------------------------------------------------------------------------- @@ -348,14 +310,6 @@ void wxNotebook::MacSetupTabs() // time because doing it in ::Create() doesn't work (for unknown reasons) void wxNotebook::OnSize(wxSizeEvent& event) { - static bool s_bFirstTime = TRUE; - if ( s_bFirstTime ) { - // TODO: any first-time-size processing. - s_bFirstTime = FALSE; - } - - // TODO: all this may or may not be necessary for your platform - // emulate page change (it's esp. important to do it first time because // otherwise our page would stay invisible) int nSel = m_nSelection; @@ -366,9 +320,9 @@ void wxNotebook::OnSize(wxSizeEvent& event) int w, h; GetSize(&w, &h); - 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]; pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin, w - kwxMacTabLeftMargin - kwxMacTabRightMargin, h - kwxMacTabTopMargin - kwxMacTabBottomMargin ); @@ -395,7 +349,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(); } @@ -448,7 +402,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) // and it may happen - just do nothing if ( nSel == nOldSel ) { - wxNotebookPage *pPage = m_aPages[nSel]; + wxNotebookPage *pPage = m_pages[nSel]; pPage->Show(FALSE); pPage->Show(TRUE); pPage->SetFocus(); @@ -457,10 +411,10 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) // Hide previous page if ( nOldSel != -1 ) { - m_aPages[nOldSel]->Show(FALSE); + m_pages[nOldSel]->Show(FALSE); } - wxNotebookPage *pPage = m_aPages[nSel]; + wxNotebookPage *pPage = m_pages[nSel]; pPage->Show(TRUE); pPage->SetFocus();