From 3d37b8c72a1abb9abacee74b1f71ab982c2bae88 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 25 Mar 2018 00:33:21 +0100 Subject: [PATCH] Reuse wxBookCtrlBase::DeleteAllPages() in wxNotebook Don't duplicate the base class code unnecessarily. No real changes. --- src/gtk1/notebook.cpp | 1 - src/msw/notebook.cpp | 10 +--------- src/osx/notebook_osx.cpp | 5 ++--- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 79f6cb8ba8..7a11bc1c20 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -586,7 +586,6 @@ bool wxNotebook::DeleteAllPages() wxASSERT_MSG( GetPageCount() == 0, wxT("all pages must have been deleted") ); - InvalidateBestSize(); return wxNotebookBase::DeleteAllPages(); } diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 4ba23c88a7..62899bc39b 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -622,19 +622,11 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) // remove all pages bool wxNotebook::DeleteAllPages() { - size_t nPageCount = GetPageCount(); - size_t nPage; - for ( nPage = 0; nPage < nPageCount; nPage++ ) - delete m_pages[nPage]; - - m_pages.Clear(); + wxBookCtrlBase::DeleteAllPages(); if ( !TabCtrl_DeleteAllItems(GetHwnd()) ) wxLogLastError(wxS("TabCtrl_DeleteAllItems()")); - m_selection = wxNOT_FOUND; - - InvalidateBestSize(); return true; } diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp index 29391e583c..fc94045154 100644 --- a/src/osx/notebook_osx.cpp +++ b/src/osx/notebook_osx.cpp @@ -199,11 +199,10 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage) // remove all pages bool wxNotebook::DeleteAllPages() { - WX_CLEAR_ARRAY(m_pages); + wxBookCtrlBase::DeleteAllPages(); + m_images.clear(); MacSetupTabs(); - m_selection = wxNOT_FOUND ; - InvalidateBestSize(); return true; }