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

Rename wxChoice::InitialiseSort() to QtInitSort()

Browse Source 
Use the prefix to indicate that this function is unique to this port.

Also don't make unnecessarily make it virtual.
This commit is contained in:
Vadim Zeitlin
2019-01-21 19:57:33 +01:00
parent b27971c501
commit cfdf80d586
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/qt/choice.h
View File

@@ -71,7 +71,7 @@ protected:
virtual void DoClear(); virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int pos); virtual void DoDeleteOneItem(unsigned int pos);
virtual void InitialiseSort(QComboBox *combo); void QtInitSort(QComboBox *combo);
QComboBox *m_qtComboBox; QComboBox *m_qtComboBox;

4
src/qt/choice.cpp
View File

@@ -75,7 +75,7 @@ wxChoice::wxChoice() :
{ {
} }
void wxChoice::InitialiseSort(QComboBox *combo) void wxChoice::QtInitSort( QComboBox *combo )
{ {
QSortFilterProxyModel *proxyModel = new LexicalSortProxyModel(); QSortFilterProxyModel *proxyModel = new LexicalSortProxyModel();
proxyModel->setSourceModel(combo->model()); proxyModel->setSourceModel(combo->model());
@@ -131,7 +131,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
{ {
m_qtComboBox = new wxQtChoice( parent, this ); m_qtComboBox = new wxQtChoice( parent, this );
InitialiseSort(m_qtComboBox); QtInitSort( m_qtComboBox );
while ( n-- > 0 ) while ( n-- > 0 )
m_qtComboBox->addItem( wxQtConvertString( *choices++ )); m_qtComboBox->addItem( wxQtConvertString( *choices++ ));

2
src/qt/combobox.cpp
View File

@@ -128,7 +128,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
const wxString& name ) const wxString& name )
{ {
m_qtComboBox = new wxQtComboBox( parent, this ); m_qtComboBox = new wxQtComboBox( parent, this );
InitialiseSort(m_qtComboBox); QtInitSort( m_qtComboBox );
while ( n-- > 0 ) while ( n-- > 0 )
m_qtComboBox->addItem( wxQtConvertString( *choices++ )); m_qtComboBox->addItem( wxQtConvertString( *choices++ ));