From 935d6f939b899943b9f47d4453a2deaa0b6d94f0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 23 May 2018 17:13:08 +0200 Subject: [PATCH] Fix compilation of generic wxNotebook used by wxMotif This should have been part of bee28c2730ce94a4e0eead18139c7d28ad6186ed --- src/generic/notebook.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index 01c4e29fdb..ea7e20266b 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -281,10 +281,10 @@ bool wxNotebook::DeletePage(size_t nPage) m_tabView->RemoveTab(GetPageId(m_tabView, pPage)); - m_pages.Remove(pPage); + m_pages.erase(m_pages.begin() + nPage); delete pPage; - if (m_pages.GetCount() == 0) + if (m_pages.empty()) { m_selection = -1; m_tabView->SetTabSelection(-1, false); @@ -330,9 +330,9 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage) m_tabView->RemoveTab(GetPageId(m_tabView, pPage)); - m_pages.Remove(pPage); + m_pages.erase(m_pages.begin() + nPage); - if (m_pages.GetCount() == 0) + if (m_pages.empty()) { m_selection = -1; m_tabView->SetTabSelection(-1, true); @@ -392,7 +392,7 @@ bool wxNotebook::DeleteAllPages() for ( nPage = 0; nPage < nPageCount; nPage++ ) delete m_pages[nPage]; - m_pages.Clear(); + m_pages.clear(); return true; } @@ -413,7 +413,7 @@ bool wxNotebook::InsertPage(size_t nPage, pPage->Show(false); // save the pointer to the page - m_pages.Insert(pPage, nPage); + m_pages.insert(m_pages.begin() + nPage, pPage); if (bSelect) { @@ -522,7 +522,7 @@ bool wxNotebook::RefreshLayout(bool force) // fit the notebook page to the tab control's display area - size_t nCount = m_pages.Count(); + size_t nCount = m_pages.size(); for ( size_t nPage = 0; nPage < nCount; nPage++ ) { wxNotebookPage *pPage = m_pages[nPage]; wxRect clientRect = GetAvailableClientSize();