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

guard against NULL textctrl, fixes #13247

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-05-24 17:38:03 +00:00
parent 01456a3fa3
commit 0f27b6637a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/pickerbase.cpp
View File

@@ -126,7 +126,7 @@ void wxPickerBase::PostCreation()
// For aesthetic reasons, make sure the picker is at least as high as the // For aesthetic reasons, make sure the picker is at least as high as the
// associated text control and is always at least square. // associated text control and is always at least square.
const wxSize pickerBestSize(m_picker->GetBestSize()); const wxSize pickerBestSize(m_picker->GetBestSize());
const wxSize textBestSize(m_text->GetBestSize()); const wxSize textBestSize( HasTextCtrl() ? m_text->GetBestSize() : wxSize());
wxSize pickerMinSize; wxSize pickerMinSize;
pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y); pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y);
pickerMinSize.x = wxMax(pickerMinSize.x, pickerMinSize.y); pickerMinSize.x = wxMax(pickerMinSize.x, pickerMinSize.y);