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

Fix crash when clearing read-only wxOwnerDrawnComboBox

Browse Source 
Check that we have an associated text entry before clearing it.

Fixes a crash introduced by 72fe57ec18
without reverting it as it still seems reasonable to use Clear() here.

Closes #18013.
This commit is contained in:
John Roberts
2018-01-24 16:40:26 +01:00
committed by Vadim Zeitlin
parent 4a37f2dd15
commit f0d5e95412
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/odcombo.cpp
View File

@@ -991,7 +991,9 @@ void wxOwnerDrawnComboBox::DoClear()
GetVListBoxComboPopup()->Clear(); GetVListBoxComboPopup()->Clear();
wxTextEntry::Clear(); // There is no text entry when using wxCB_READONLY style, so test for it.
if ( GetTextCtrl() )
wxTextEntry::Clear();
} }
void wxOwnerDrawnComboBox::Clear() void wxOwnerDrawnComboBox::Clear()