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

Merge branch 'qt_listctrl_find_text' of https://github.com/GeoTeric/wxWidgets

Browse Source 
Fix wxListCtrl::FindItem() and add support for columns to GetItemText()
in wxQt.

See https://github.com/wxWidgets/wxWidgets/pull/1174
This commit is contained in:
Vadim Zeitlin
2019-01-24 22:42:35 +01:00
parent 42c602bddf f9280c8529
commit 7a42dbd83b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,7 +292,7 @@ protected:
void Init();
// Implement base class pure virtual methods.
long DoInsertColumn(long col, const wxListItem& info);
virtual long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE;
QTreeWidgetItem *QtGetItem(int id) const;

6
src/qt/listctrl.cpp
View File

@@ -413,11 +413,11 @@ bool wxListCtrl::SetItemColumnImage(long item, long column, int image)
return SetItem(info);
}
wxString wxListCtrl::GetItemText(long item, int WXUNUSED(col)) const
wxString wxListCtrl::GetItemText(long item, int col) const
{
QTreeWidgetItem *qitem = QtGetItem(item);
if ( qitem )
return wxQtConvertString( qitem->text(0) );
return wxQtConvertString( qitem->text(col) );
else
return wxString();
}
@@ -762,7 +762,7 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
!partial ? Qt::MatchExactly : Qt::MatchContains );
for (int i=0; i<qitems.length(); i++)
{
ret = m_qtTreeWidget->indexOfTopLevelItem(qitems.at(0));
ret = m_qtTreeWidget->indexOfTopLevelItem(qitems.at(i));
if ( ret >= start )
return ret;
}