Fix typo in last commit

[wxWidgets.git] / src / common / pickerbase.cpp

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 412ddc39e0ec1b0c19f921cd2bb95f051d9d30f7..797c946876f5849f88ccf4dfc99c5d74b19fdeb4 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -43,13 +43,6 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl)
 
 
 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPickerBase
 // ----------------------------------------------------------------------------


@@ -66,13 +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;
     // 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;
     if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
                            validator, name))
         return false;

-        
+

     SetMinSize( size );
     SetMinSize( size );

-        
+

     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))
     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))


@@ -94,7 +87,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // the m_picker; for very long strings, this real-time synchronization could
         // become a CPU-blocker and thus should be avoided.
         // 32 characters will be more than enough for all common uses.
         // the m_picker; for very long strings, this real-time synchronization could
         // become a CPU-blocker and thus should be avoided.
         // 32 characters will be more than enough for all common uses.

-        // m_text->SetMaxLength(32);
+        m_text->SetMaxLength(32);

 
         // set the initial contents of the textctrl
         m_text->SetValue(text);
 
         // set the initial contents of the textctrl
         m_text->SetValue(text);


@@ -113,7 +106,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // the text control's proportion values defaults to 2
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }
         // the text control's proportion values defaults to 2
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -123,8 +116,18 @@ void wxPickerBase::PostCreation()
     // associated with it - in that case it defaults to 0
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     // 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.
+    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);
     SetSizer(m_sizer);

-    
+

     SetInitialSize( GetMinSize() );
 }
 
     SetInitialSize( GetMinSize() );
 }
 


@@ -169,11 +172,4 @@ void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &)
     UpdatePickerFromTextCtrl();
 }
 
     UpdatePickerFromTextCtrl();
 }
 

-void wxPickerBase::OnSize(wxSizeEvent &event)
-{
-    if (GetAutoLayout())
-        Layout();
-    event.Skip();
-}
-

 #endif // Any picker in use
 #endif // Any picker in use