From: Julian Smart Date: Sat, 13 Dec 2003 10:24:00 +0000 (+0000) Subject: Added wxUSE_TOOLTIPS guard for previous patch X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5b5ea4664162471bb709cf6addaba92936ccd36a Added wxUSE_TOOLTIPS guard for previous patch git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index e6b2bfd19e..3ee328dff5 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -2857,15 +2857,16 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event ) { if ( !m_anchor ) return; +#if wxUSE_TOOLTIPS // Determines what item we are hovering over and need a tooltip for - wxTreeItemId HoverItem = HitTest(ScreenToClient(wxGetMousePosition())); + wxTreeItemId hoverItem = HitTest(ScreenToClient(wxGetMousePosition())); // We do not want a tooltip if we are dragging, or if the rename timer is running - if (HoverItem.IsOk() && !m_isDragging && (!m_renameTimer || !m_renameTimer->IsRunning())) + if (hoverItem.IsOk() && !m_isDragging && (!m_renameTimer || !m_renameTimer->IsRunning())) { // Ask the tree control what tooltip (if any) should be shown wxTreeEvent hevent(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, GetId()); - hevent.m_item = (long) HoverItem; + hevent.m_item = (long) hoverItem; hevent.SetEventObject(this); if ( GetEventHandler()->ProcessEvent(hevent) && hevent.IsAllowed() ) @@ -2873,6 +2874,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event ) SetToolTip(hevent.m_label); } } +#endif // we process left mouse up event (enables in-place edit), right down // (pass to the user code), left dbl click (activate item) and