set tooltips for the both subcontrols (patch 1622531)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
#include "wx/containr.h"
|
#include "wx/containr.h"
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE wxTextCtrl;
|
class WXDLLIMPEXP_CORE wxTextCtrl;
|
||||||
|
class WXDLLEXPORT wxToolTip;
|
||||||
|
|
||||||
extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
|
extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
|
||||||
|
|
||||||
@@ -51,6 +52,7 @@ 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
|
||||||
|
|
||||||
|
@@ -30,11 +30,13 @@
|
|||||||
wxUSE_FONTPICKERCTRL
|
wxUSE_FONTPICKERCTRL
|
||||||
|
|
||||||
#include "wx/pickerbase.h"
|
#include "wx/pickerbase.h"
|
||||||
|
#include "wx/tooltip.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/textctrl.h"
|
#include "wx/textctrl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
@@ -122,6 +124,23 @@ void wxPickerBase::PostCreation()
|
|||||||
SetMinSize( m_sizer->GetMinSize() );
|
SetMinSize( m_sizer->GetMinSize() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// wxPickerBase - event handlers
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent &)
|
void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent &)
|
||||||
{
|
{
|
||||||
wxASSERT(m_text);
|
wxASSERT(m_text);
|
||||||
|
Reference in New Issue
Block a user