Fix setting tooltips for wxSearchCtrl and other composite controls.

Propagate SetToolTip() call on wxCompositeWindow to all subwindows to ensure
that the tooltip is shown for all parts of the window.

Notice that this is still not ideal as the tooltip temporarily disappears when
mouse moves from one subwindow to another, instead of staying in place as it
does with "monolithic" windows and ideally we should find a way to avoid it
(should be possible at least under MSW with TTM_RELAYEVENT) but for now this
is already much better than nothing.

Closes #13523.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 101cf891fd798c48d12cb95e354463b6a675b100..1d3ca3bb0b7889dcfb53bd6ecc1583ba8f8fda85 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -472,6 +472,7 @@ All (GUI):
 - Added wxPersistentSplitter.
 - Added wxWebView library (Steven Lamerton & Auria, GSoC 2011 project).
 - Derive wxAuiNotebook from wxBookCtrlBase (Steven Lamerton)
 - Added wxPersistentSplitter.
 - Added wxWebView library (Steven Lamerton & Auria, GSoC 2011 project).
 - Derive wxAuiNotebook from wxBookCtrlBase (Steven Lamerton)

+- Fix tooltips in wxSearchCtrl and other composite controls (Catalin Raceanu).

 
 OSX:
 
 
 OSX:
 

diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h
index 9ac62639c2ace5804d40f7f28572d86bf6fa5b3b..3ce906c6a256bb3de18899eb6814ca28a0dd3238 100644 (file)
--- a/include/wx/compositewin.h
+++ b/include/wx/compositewin.h
@@ -3,7 +3,7 @@
 // Purpose:     wxCompositeWindow<> declaration
 // Author:      Vadim Zeitlin
 // Created:     2011-01-02
 // Purpose:     wxCompositeWindow<> declaration
 // Author:      Vadim Zeitlin
 // Created:     2011-01-02

-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -13,6 +13,8 @@
 
 #include "wx/window.h"
 
 
 #include "wx/window.h"
 

+class WXDLLIMPEXP_FWD_CORE wxToolTip;
+

 // NB: This is an experimental and, as for now, undocumented class used only by
 //     wxWidgets itself internally. Don't use it in your code until its API is
 //     officially stabilized unless you are ready to change it with the next
 // NB: This is an experimental and, as for now, undocumented class used only by
 //     wxWidgets itself internally. Don't use it in your code until its API is
 //     officially stabilized unless you are ready to change it with the next


@@ -59,7 +61,7 @@ public:
         if ( !BaseWindowClass::SetForegroundColour(colour) )
             return false;
 
         if ( !BaseWindowClass::SetForegroundColour(colour) )
             return false;
 

-        DoSetForAllParts(&wxWindowBase::SetForegroundColour, colour);
+        SetForAllParts(&wxWindowBase::SetForegroundColour, colour);

 
         return true;
     }
 
         return true;
     }


@@ -69,7 +71,7 @@ public:
         if ( !BaseWindowClass::SetBackgroundColour(colour) )
             return false;
 
         if ( !BaseWindowClass::SetBackgroundColour(colour) )
             return false;
 

-        DoSetForAllParts(&wxWindowBase::SetBackgroundColour, colour);
+        SetForAllParts(&wxWindowBase::SetBackgroundColour, colour);

 
         return true;
     }
 
         return true;
     }


@@ -79,7 +81,7 @@ public:
         if ( !BaseWindowClass::SetFont(font) )
             return false;
 
         if ( !BaseWindowClass::SetFont(font) )
             return false;
 

-        DoSetForAllParts(&wxWindowBase::SetFont, font);
+        SetForAllParts(&wxWindowBase::SetFont, font);

 
         return true;
     }
 
         return true;
     }


@@ -89,18 +91,39 @@ public:
         if ( !BaseWindowClass::SetCursor(cursor) )
             return false;
 
         if ( !BaseWindowClass::SetCursor(cursor) )
             return false;
 

-        DoSetForAllParts(&wxWindowBase::SetCursor, cursor);
+        SetForAllParts(&wxWindowBase::SetCursor, cursor);

 
         return true;
     }
 
 
         return true;
     }
 

+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip(wxToolTip *tip)
+    {
+        BaseWindowClass::DoSetToolTip(tip);
+
+        SetForAllParts(&wxWindowBase::CopyToolTip, tip);
+    }
+#endif // wxUSE_TOOLTIPS
+

 private:
     // Must be implemented by the derived class to return all children to which
     // the public methods we override should forward to.
     virtual wxWindowList GetCompositeWindowParts() const = 0;
 
     template <class T>
 private:
     // Must be implemented by the derived class to return all children to which
     // the public methods we override should forward to.
     virtual wxWindowList GetCompositeWindowParts() const = 0;
 
     template <class T>

-    void DoSetForAllParts(bool (wxWindowBase::*func)(const T&), const T& arg)
+    void SetForAllParts(bool (wxWindowBase::*func)(const T&), const T& arg)
+    {
+        DoSetForAllParts<const T&>(func, arg);
+    }
+
+    template <class T>
+    void SetForAllParts(bool (wxWindowBase::*func)(T*), T* arg)
+    {
+        DoSetForAllParts<T*>(func, arg);
+    }
+
+    template <class T>
+    void DoSetForAllParts(bool (wxWindowBase::*func)(T), T arg)

     {
         // Simply call the setters for all parts of this composite window.
         const wxWindowList parts = GetCompositeWindowParts();
     {
         // Simply call the setters for all parts of this composite window.
         const wxWindowList parts = GetCompositeWindowParts();