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

Remove unnecessary wxNotebook::DoSetSelection() from wxQt

Browse Source 
Having this method didn't really help, it's simpler and more
straightforward to implement ChangeSelection() as a signal-blocking
wrapper around SetSelection() instead.

No real changes in behaviour, this is a pure refactoring.
This commit is contained in:
Vadim Zeitlin
2019-01-28 17:51:27 +01:00
parent 6b11c372a1
commit 665b5a76a8
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/qt/notebook.h
View File

@@ -42,14 +42,13 @@ public:
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } int SetSelection(size_t nPage);
int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); } int ChangeSelection(size_t nPage);
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const;
protected: protected:
virtual wxWindow *DoRemovePage(size_t page); virtual wxWindow *DoRemovePage(size_t page);
int DoSetSelection(size_t nPage, int flags = 0);
private: private:
QTabWidget *m_qtTabWidget; QTabWidget *m_qtTabWidget;

24
src/qt/notebook.cpp
View File

@@ -169,27 +169,31 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
return sizePage; return sizePage;
} }
int wxNotebook::DoSetSelection(size_t page, int flags) int wxNotebook::SetSelection(size_t page)
{ {
wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index"); wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");
int selOld = GetSelection(); int selOld = GetSelection();
// do not fire signals for certain methods (i.e. ChangeSelection
if ( !(flags & SetSelection_SendEvent) )
{
m_qtTabWidget->blockSignals(true);
}
// change the QTabWidget selected page: // change the QTabWidget selected page:
m_selection = page; m_selection = page;
m_qtTabWidget->setCurrentIndex( page ); m_qtTabWidget->setCurrentIndex( page );
if ( !(flags & SetSelection_SendEvent) )
{
m_qtTabWidget->blockSignals(false);
}
return selOld; return selOld;
} }
int wxNotebook::ChangeSelection(size_t nPage)
{
// ChangeSelection() is not supposed to generate events, unlike
// SetSelection().
m_qtTabWidget->blockSignals(true);
const int selOld = SetSelection(nPage);
m_qtTabWidget->blockSignals(false);
return selOld;
}
wxWindow *wxNotebook::DoRemovePage(size_t page) wxWindow *wxNotebook::DoRemovePage(size_t page)
{ {