add #if wxUSE_TOOLTIPS around DoSetToolTip()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index b49fc3e7b835eda8d1e689baf7110ac722dd7181..c1b8bb9b496961e248fd075be1c33ae092dca556 100644 (file)
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -52,8 +52,6 @@ public:
                     const wxValidator& validator = wxDefaultValidator,
                     const wxString& name = wxButtonNameStr);
 
-    virtual void DoSetToolTip( wxToolTip *tip );
-
 public:     // public API
 
     // margin between the text control and the picker
@@ -107,12 +105,16 @@ public:     // public API
     wxControl *GetPickerCtrl()
         { return m_picker; }
 
-public:     // methods that derived class must/may override
-
+    // methods that derived class must/may override
     virtual void UpdatePickerFromTextCtrl() = 0;
     virtual void UpdateTextCtrlFromPicker() = 0;
 
-protected:        // utility functions
+protected:
+    // overridden base class methods
+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip(wxToolTip *tip);
+#endif // wxUSE_TOOLTIPS
+
 
     // event handlers
     void OnTextCtrlDelete(wxWindowDestroyEvent &);

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 05ff622e368ba1d1a4ee0617e3c3ddafe65cac66..3d09e22d116bcf9bb171db16cd78e3994623457e 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
@@ -135,7 +137,7 @@ void wxPickerBase::DoSetToolTip( wxToolTip *tip )
     m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
 }
 
-
+#endif // wxUSE_TOOLTIPS
 
 // ----------------------------------------------------------------------------
 // wxPickerBase - event handlers