fix wxEVT_SPIN_XXX definitions in a nicer (compatible with new events) way

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

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index f02542619313d0b9861249c806bd9cef22ef708b..0176c2a2a829e4727980c3e5fc2a54e0708f152b 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -30,11 +30,13 @@
     wxUSE_FONTPICKERCTRL
 
 #include "wx/pickerbase.h"
+#include "wx/tooltip.h"
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 #endif
 
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -94,14 +96,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);
 
@@ -122,9 +124,29 @@ void wxPickerBase::PostCreation()
     SetMinSize( m_sizer->GetMinSize() );
 }
 
-void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent &)
+#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
+    // 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)
 {
-    wxASSERT(m_text);
+    event.Skip();
 
     // don't leave the textctrl empty
     if (m_text->GetValue().empty())