solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Protect non-editable wxComboBox from nullptr on wxQt.

Browse source
This commit is contained in:
Alex Shvartzkop 2024-01-11 08:31:06 +03:00
parent 8730858eae
commit 94e73dace5
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/qt/combobox.cpp
View file

@ -288,40 +288,48 @@ void wxComboBox::SetSelection( long from, long to )
SetInsertionPoint( from );
// use the inner text entry widget (note that can be null if not editable)
if ( m_qtComboBox->lineEdit() != nullptr )
if ( QLineEdit* const lineEdit = m_qtComboBox->lineEdit() )
{
m_qtComboBox->lineEdit()->setSelection( from, to - from );
lineEdit->setSelection( from, to - from );
}
}
void wxComboBox::SetInsertionPoint( long pos )
{
// check if pos indicates end of text:
if ( pos == -1 )
m_qtComboBox->lineEdit()->end( false );
else
m_qtComboBox->lineEdit()->setCursorPosition( pos );
if ( QLineEdit* const lineEdit = m_qtComboBox->lineEdit() )
{
// check if pos indicates end of text:
if ( pos == -1 )
lineEdit->end( false );
else
lineEdit->setCursorPosition( pos );
}
}
long wxComboBox::GetInsertionPoint() const
{
long selectionStart = m_qtComboBox->lineEdit()->selectionStart();
QLineEdit* const lineEdit = m_qtComboBox->lineEdit();
if ( !lineEdit )
return -1;
long selectionStart = lineEdit->selectionStart();
if ( selectionStart >= 0 )
return selectionStart;
return m_qtComboBox->lineEdit()->cursorPosition();
return lineEdit->cursorPosition();
}
void wxComboBox::GetSelection(long* from, long* to) const
{
// use the inner text entry widget (note that can be null if not editable)
if ( m_qtComboBox->lineEdit() != nullptr )
if ( QLineEdit* const lineEdit = m_qtComboBox->lineEdit() )
{
*from = m_qtComboBox->lineEdit()->selectionStart();
*from = lineEdit->selectionStart();
if ( *from >= 0 )
{
*to = *from + m_qtComboBox->lineEdit()->selectedText().length();
*to = *from + lineEdit->selectedText().length();
return;
}
}