From 0f27b6637ae7210b7a17b2fb5869a43ee5db06a7 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 24 May 2011 17:38:03 +0000
Subject: [PATCH] guard against NULL textctrl, fixes #13247

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/pickerbase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 81583028ac..cd73e10814 100644
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -126,7 +126,7 @@ void wxPickerBase::PostCreation()
     // For aesthetic reasons, make sure the picker is at least as high as the
     // associated text control and is always at least square.
     const wxSize pickerBestSize(m_picker->GetBestSize());
-    const wxSize textBestSize(m_text->GetBestSize());
+    const wxSize textBestSize( HasTextCtrl() ? m_text->GetBestSize() : wxSize());
     wxSize pickerMinSize;
     pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y);
     pickerMinSize.x = wxMax(pickerMinSize.x, pickerMinSize.y);