Fix combo box model problems

diff --git a/src/Qtx/QtxComboBox.cxx b/src/Qtx/QtxComboBox.cxx
index 25ac78cf73ccd42396e0caaf6ac4295106773ae8..831cb18c548eea3c89e8cdc2f3ccd249076151a2 100755 (executable)
--- a/src/Qtx/QtxComboBox.cxx
+++ b/src/Qtx/QtxComboBox.cxx
@@ -85,7 +85,8 @@ void QtxComboBox::Model::setCleared( const bool isClear )
 */
 QVariant QtxComboBox::Model::data( const QModelIndex& index, int role ) const
 {
-  return myCleared ? QVariant() : QStandardItemModel::data( index, role );
+  return ( myCleared && ( role == Qt::DisplayRole || role == Qt::DecorationRole ) ) ?
+    QVariant() : QStandardItemModel::data( index, role );
 }
 
 /*!