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

Fix crash when getting or setting wxComboBox value in wxUniv.

Browse Source 
Forward DoGetValue() and SetValue() to the associated wxTextCtrl.

Closes #13298.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-07-04 21:09:24 +00:00
parent 4e32015c90
commit 0aae39efd2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/univ/combobox.cpp
View File

@@ -273,12 +273,13 @@ wxComboBox::~wxComboBox()
wxString wxComboBox::DoGetValue() const wxString wxComboBox::DoGetValue() const
{ {
return wxComboCtrl::GetValue(); return GetTextCtrl() ? GetTextCtrl()->GetValue() : wxString();
} }
void wxComboBox::SetValue(const wxString& value) void wxComboBox::SetValue(const wxString& value)
{ {
wxComboCtrl::SetValue(value); if ( GetTextCtrl() )
GetTextCtrl()->SetValue(value);
} }
void wxComboBox::WriteText(const wxString& value) void wxComboBox::WriteText(const wxString& value)