post wxUniv merge fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/notebmac.cpp

@@ -80,7 +80,6 @@ void wxNotebook::Init()
     m_macHorizontalBorder = 7;
     m_macVerticalBorder = 8;
 #endif
-    m_pImageList = NULL;
     m_nSelection = -1;
 }
 
@@ -132,14 +131,17 @@ wxNotebook::~wxNotebook()
 // ----------------------------------------------------------------------------
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
-int wxNotebook::GetPageCount() const
+
+void wxNotebook::SetPadding(const wxSize& padding)
 {
-    return m_aPages.Count();
 }
 
-int wxNotebook::GetRowCount() const
+void wxNotebook::SetTabSize(const wxSize& sz)
+{
+}
+
+void wxNotebook::SetPageSize(const wxSize& size)
 {
-    return 1;
 }
 
 int wxNotebook::SetSelection(int nPage)
@@ -152,24 +154,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,7 +169,7 @@ wxString wxNotebook::GetPageText(int nPage) const
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
-    wxNotebookPage *page = m_aPages[nPage];
+    wxNotebookPage *page = m_pages[nPage];
     return page->GetLabel();
 }
 
@@ -200,23 +189,16 @@ bool wxNotebook::SetPageImage(int nPage, int nImage)
     return FALSE;
 }
 
-void wxNotebook::SetImageList(wxImageList* imageList)
-{ 
-    m_pImageList = imageList;
-    // TODO
-}
-
 // ----------------------------------------------------------------------------
 // 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.Remove(nPage);
 
     MacSetupTabs();
 
@@ -224,20 +206,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 +216,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 +236,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 +278,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
@@ -366,9 +323,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 +352,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 +405,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 +414,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();