add #if wxUSE_TOOLTIPS around DoSetToolTip()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,8 +52,6 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxButtonNameStr);
|
const wxString& name = wxButtonNameStr);
|
||||||
|
|
||||||
virtual void DoSetToolTip( wxToolTip *tip );
|
|
||||||
|
|
||||||
public: // public API
|
public: // public API
|
||||||
|
|
||||||
// margin between the text control and the picker
|
// margin between the text control and the picker
|
||||||
@@ -107,12 +105,16 @@ public: // public API
|
|||||||
wxControl *GetPickerCtrl()
|
wxControl *GetPickerCtrl()
|
||||||
{ return m_picker; }
|
{ return m_picker; }
|
||||||
|
|
||||||
public: // methods that derived class must/may override
|
// methods that derived class must/may override
|
||||||
|
|
||||||
virtual void UpdatePickerFromTextCtrl() = 0;
|
virtual void UpdatePickerFromTextCtrl() = 0;
|
||||||
virtual void UpdateTextCtrlFromPicker() = 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
|
// event handlers
|
||||||
void OnTextCtrlDelete(wxWindowDestroyEvent &);
|
void OnTextCtrlDelete(wxWindowDestroyEvent &);
|
||||||
|
@@ -124,6 +124,8 @@ void wxPickerBase::PostCreation()
|
|||||||
SetMinSize( m_sizer->GetMinSize() );
|
SetMinSize( m_sizer->GetMinSize() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if wxUSE_TOOLTIPS
|
||||||
|
|
||||||
void wxPickerBase::DoSetToolTip(wxToolTip *tip)
|
void wxPickerBase::DoSetToolTip(wxToolTip *tip)
|
||||||
{
|
{
|
||||||
// don't set the tooltip on us but rather on our two child windows
|
// don't set the tooltip on us but rather on our two child windows
|
||||||
@@ -135,7 +137,7 @@ void wxPickerBase::DoSetToolTip( wxToolTip *tip )
|
|||||||
m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
|
m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // wxUSE_TOOLTIPS
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxPickerBase - event handlers
|
// wxPickerBase - event handlers
|
||||||
|
Reference in New Issue
Block a user