X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2dc658bbaa0f323293eb78dc098e87fb52ebe9c..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/pickerbase.cpp

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 05ff622e36..da1a4ad59d 100644
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -43,13 +43,6 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl)
 
-BEGIN_EVENT_TABLE(wxPickerBase, wxControl)
-    EVT_SIZE(wxPickerBase::OnSize)
-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxPickerBase)
-END_EVENT_TABLE()
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxPickerBase, wxControl)
-
-
 // ----------------------------------------------------------------------------
 // wxPickerBase
 // ----------------------------------------------------------------------------
@@ -66,10 +59,13 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
     // remove any border style from our style as wxPickerBase's window must be
     // invisible (user styles must be set on the textctrl or the platform-dependent picker)
     style &= ~wxBORDER_MASK;
+
     if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
                            validator, name))
         return false;
 
+    SetMinSize( size );
+
     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))
@@ -96,14 +92,14 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // set the initial contents of the textctrl
         m_text->SetValue(text);
 
-        m_text->Connect(wxEVT_COMMAND_TEXT_UPDATED,
+        m_text->Connect(m_text->GetId(), wxEVT_COMMAND_TEXT_UPDATED,
                 wxCommandEventHandler(wxPickerBase::OnTextCtrlUpdate),
                 NULL, this);
-        m_text->Connect(wxEVT_KILL_FOCUS,
+        m_text->Connect(m_text->GetId(), wxEVT_KILL_FOCUS,
                 wxFocusEventHandler(wxPickerBase::OnTextCtrlKillFocus),
                 NULL, this);
 
-        m_text->Connect(wxEVT_DESTROY,
+        m_text->Connect(m_text->GetId(), wxEVT_DESTROY,
                 wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
                 NULL, this);
 
@@ -120,11 +116,29 @@ void wxPickerBase::PostCreation()
     // associated with it - in that case it defaults to 0
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
+    // For aesthetic reasons, make sure the picker is at least as high as the
+    // associated text control and is always at least square, unless we are
+    // explicitly using wxPB_SMALL style to force it to take as little space as
+    // possible.
+    if ( !HasFlag(wxPB_SMALL) )
+    {
+        const wxSize pickerBestSize(m_picker->GetBestSize());
+        const wxSize textBestSize( HasTextCtrl() ? m_text->GetBestSize() : wxSize());
+        wxSize pickerMinSize;
+        pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y);
+        pickerMinSize.x = wxMax(pickerBestSize.x, pickerMinSize.y);
+        if ( pickerMinSize != pickerBestSize )
+            m_picker->SetMinSize(pickerMinSize);
+    }
+
     SetSizer(m_sizer);
-    SetMinSize( m_sizer->GetMinSize() );
+
+    SetInitialSize( GetMinSize() );
 }
 
-void wxPickerBase::DoSetToolTip( wxToolTip *tip )
+#if wxUSE_TOOLTIPS
+
+void wxPickerBase::DoSetToolTip(wxToolTip *tip)
 {
     // don't set the tooltip on us but rather on our two child windows
     // as otherwise it would appear only when the cursor is placed on the
@@ -132,21 +146,22 @@ void wxPickerBase::DoSetToolTip( wxToolTip *tip )
     m_picker->SetToolTip(tip);
 
     // do a copy as wxWindow will own the pointer we pass
-    m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
+    if ( m_text )
+        m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
 }
 
-
+#endif // wxUSE_TOOLTIPS
 
 // ----------------------------------------------------------------------------
 // wxPickerBase - event handlers
 // ----------------------------------------------------------------------------
 
-void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent &)
+void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent& event)
 {
-    wxASSERT(m_text);
+    event.Skip();
 
     // don't leave the textctrl empty
-    if (m_text->GetValue().empty())
+    if (m_text && m_text->GetValue().empty())
         UpdateTextCtrlFromPicker();
 }
 
@@ -162,11 +177,4 @@ void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &)
     UpdatePickerFromTextCtrl();
 }
 
-void wxPickerBase::OnSize(wxSizeEvent &event)
-{
-    if (GetAutoLayout())
-        Layout();
-    event.Skip();
-}
-
 #endif // Any picker in use