Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation of generic wxNotebook used by wxMotif

Browse Source 
This should have been part of bee28c2730
This commit is contained in:
Vadim Zeitlin
2018-05-23 17:13:08 +02:00
parent 6121b08b67
commit 935d6f939b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/notebook.cpp
View File

@@ -281,10 +281,10 @@ bool wxNotebook::DeletePage(size_t nPage)
m_tabView->RemoveTab(GetPageId(m_tabView, pPage)); m_tabView->RemoveTab(GetPageId(m_tabView, pPage));
m_pages.Remove(pPage); m_pages.erase(m_pages.begin() + nPage);
delete pPage; delete pPage;
if (m_pages.GetCount() == 0) if (m_pages.empty())
{ {
m_selection = -1; m_selection = -1;
m_tabView->SetTabSelection(-1, false); m_tabView->SetTabSelection(-1, false);
@@ -330,9 +330,9 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
m_tabView->RemoveTab(GetPageId(m_tabView, pPage)); 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_selection = -1;
m_tabView->SetTabSelection(-1, true); m_tabView->SetTabSelection(-1, true);
@@ -392,7 +392,7 @@ bool wxNotebook::DeleteAllPages()
for ( nPage = 0; nPage < nPageCount; nPage++ ) for ( nPage = 0; nPage < nPageCount; nPage++ )
delete m_pages[nPage]; delete m_pages[nPage];
m_pages.Clear(); m_pages.clear();
return true; return true;
} }
@@ -413,7 +413,7 @@ bool wxNotebook::InsertPage(size_t nPage,
pPage->Show(false); pPage->Show(false);
// save the pointer to the page // save the pointer to the page
m_pages.Insert(pPage, nPage); m_pages.insert(m_pages.begin() + nPage, pPage);
if (bSelect) if (bSelect)
{ {
@@ -522,7 +522,7 @@ bool wxNotebook::RefreshLayout(bool force)
// fit the notebook page to the tab control's display area // 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++ ) { for ( size_t nPage = 0; nPage < nCount; nPage++ ) {
wxNotebookPage *pPage = m_pages[nPage]; wxNotebookPage *pPage = m_pages[nPage];
wxRect clientRect = GetAvailableClientSize(); wxRect clientRect = GetAvailableClientSize();