From 3cb395a5a5a5639f7264a19784297d22ea9ab5ca Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Mon, 28 Jan 2019 16:52:07 +0000 Subject: [PATCH] Implement wxNotebook::DeleteAllPages() for wxQt See https://github.com/wxWidgets/wxWidgets/pull/1191 --- include/wx/qt/notebook.h | 2 ++ src/qt/notebook.cpp | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/wx/qt/notebook.h b/include/wx/qt/notebook.h index 288d0d9a7f..9db81bb917 100644 --- a/include/wx/qt/notebook.h +++ b/include/wx/qt/notebook.h @@ -45,6 +45,8 @@ public: int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); } + virtual bool DeleteAllPages() wxOVERRIDE; + virtual QWidget *GetHandle() const; protected: diff --git a/src/qt/notebook.cpp b/src/qt/notebook.cpp index 27d4ce7387..92c9fe3e82 100644 --- a/src/qt/notebook.cpp +++ b/src/qt/notebook.cpp @@ -169,6 +169,17 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const return sizePage; } +bool wxNotebook::DeleteAllPages() +{ + if ( !wxNotebookBase::DeleteAllPages() ) + return false; + + m_qtTabWidget->blockSignals(true); + m_qtTabWidget->clear(); + m_qtTabWidget->blockSignals(false); + return true; +} + int wxNotebook::DoSetSelection(size_t page, int flags) { wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");