Fix compilation error in recent change to wxSizeEvent generation.

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

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index f02542619313d0b9861249c806bd9cef22ef708b..1d3dbbc30d1a1d4a128ecbfe3df9a20297440be2 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -30,11 +30,13 @@
     wxUSE_FONTPICKERCTRL
 
 #include "wx/pickerbase.h"
     wxUSE_FONTPICKERCTRL
 
 #include "wx/pickerbase.h"

+#include "wx/tooltip.h"

 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 #endif
 
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 #endif
 

+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -64,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))


@@ -94,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);
 


@@ -119,15 +124,36 @@ void wxPickerBase::PostCreation()
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     SetSizer(m_sizer);
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     SetSizer(m_sizer);

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

 }
 
 }
 

-void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent &)
+#if wxUSE_TOOLTIPS
+
+void wxPickerBase::DoSetToolTip(wxToolTip *tip)

 {
 {

-    wxASSERT(m_text);
+    // 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
+    // small area around the child windows which belong to wxPickerBase
+    m_picker->SetToolTip(tip);
+
+    // do a copy as wxWindow will own the pointer we pass
+    if ( m_text )
+        m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
+}
+
+#endif // wxUSE_TOOLTIPS
+
+// ----------------------------------------------------------------------------
+// wxPickerBase - event handlers
+// ----------------------------------------------------------------------------
+
+void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent& event)
+{
+    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();
 }