Fix tracking rectangles in 64-bit build by remembering the tag as the 64-bit integer...

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

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 05ff622e368ba1d1a4ee0617e3c3ddafe65cac66..867712afbfe071c82825c973f5e6d759fdbf690a 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -124,7 +124,9 @@ void wxPickerBase::PostCreation()
     SetMinSize( m_sizer->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,10 +134,11 @@ 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