fix memory leak in wxScreenDC, fixes #13249

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

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 867712afbfe071c82825c973f5e6d759fdbf690a..ce17ad7da88493e00b2b2e359092f94b67421030 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -66,10 +66,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 );
+

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


@@ -96,14 +99,14 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // set the initial contents of the textctrl
         m_text->SetValue(text);
 
         // 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);
                 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);
 
                 wxFocusEventHandler(wxPickerBase::OnTextCtrlKillFocus),
                 NULL, this);
 

-        m_text->Connect(wxEVT_DESTROY,
+        m_text->Connect(m_text->GetId(), wxEVT_DESTROY,

                 wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
                 NULL, this);
 
                 wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
                 NULL, this);
 


@@ -120,8 +123,19 @@ 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);

-    SetMinSize( m_sizer->GetMinSize() );
+
+    SetInitialSize( GetMinSize() );

 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS


@@ -144,12 +158,12 @@ void wxPickerBase::DoSetToolTip(wxToolTip *tip)
 // wxPickerBase - event handlers
 // ----------------------------------------------------------------------------
 
 // wxPickerBase - event handlers
 // ----------------------------------------------------------------------------
 

-void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent &)
+void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent& event)

 {
 {

-    wxASSERT(m_text);
+    event.Skip();

 
     // don't leave the textctrl empty
 
     // don't leave the textctrl empty

-    if (m_text->GetValue().empty())
+    if (m_text && m_text->GetValue().empty())

         UpdateTextCtrlFromPicker();
 }
 
         UpdateTextCtrlFromPicker();
 }