added wxToolTip::SetAutoPop() and SetReshow() (patch 1768804)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 91189d5e8524b5914aab36b0f6250f59a835d8ae..5c131d3689d59248c66d606d5b6123cc6858b9e7 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -154,6 +154,7 @@ All (GUI):
 - Show standard options in wxCmdLineParser usage message (Francesco Montorsi).
 - Added wxRect::operator+ (union) and * (intersection) (bdonner).
 - Added support for two auxiliary mouse buttons to wxMouseEvent (Chris Weiland).
+- Added wxToolTip::SetAutoPop() and SetReshow() (Jan Knepper)
 - Added wxTaskBarIcon::Destroy()
 
 wxGTK:

diff --git a/docs/latex/wx/tooltip.tex b/docs/latex/wx/tooltip.tex
index 7b35a9aa656024e70fa87df8bfef3ec8e1b900e2..2405dd04eef2063ef9223053a5bc7ede76632c5a 100644 (file)
--- a/docs/latex/wx/tooltip.tex
+++ b/docs/latex/wx/tooltip.tex
@@ -3,8 +3,10 @@
 This class holds information about a tooltip associated with a window
 (see \helpref{wxWindow::SetToolTip}{wxwindowsettooltip}).
 
-The two static methods, \helpref{wxToolTip::Enable}{wxtooltipenable} and
-\helpref{wxToolTip::SetDelay}{wxtooltipsetdelay} can be used to globally
+The four static methods, \helpref{wxToolTip::Enable}{wxtooltipenable},
+\helpref{wxToolTip::SetDelay}{wxtooltipsetdelay} 
+\helpref(wxToolTip::SetAutoPop)(wxtooltipsetautopop) and 
+\helpref(wxToolTip::SetReshow)(wxtooltipsetreshow) can be used to globally
 alter tooltips behaviour.
 
 \wxheading{Derived from}
@@ -39,6 +41,21 @@ Set the delay after which the tooltip appears.
 
 May not be supported on all platforms (eg. wxCocoa).
 
+\membersection{wxToolTip::SetAutoPop}\label{wxtooltipsetautopop}
+
+\func{static void}{SetAutoPop}{\param{long }{msecs}}
+
+Set the delay after which the tooltip disappears or how long a
+tooltip remains visible.
+May not be supported on all platforms (eg. wxCocoa, GTK, Palmos).
+
+\membersection{wxToolTip::SetReshow}\label{wxtooltipsetreshow}
+
+\func{static void}{SetReshow}{\param{long }{msecs}}
+
+Set the delay between subsequent tooltips to appear.
+May not be supported on all platforms (eg. wxCocoa, GTK, Palmos).
+
 \membersection{wxToolTip::wxToolTip}\label{wxtooltipwxtooltip}
 
 \func{}{wxToolTip}{\param{const wxString\& }{tip}}

diff --git a/include/wx/cocoa/tooltip.h b/include/wx/cocoa/tooltip.h
index 784718164bebc44700e0b5f139aae850c50ee7d6..42c9abfc35ea624c86b994b628992b57e2a97093 100644 (file)
--- a/include/wx/cocoa/tooltip.h
+++ b/include/wx/cocoa/tooltip.h
@@ -36,6 +36,10 @@ public:
     static void Enable(bool flag);
         // set the delay after which the tooltip appears
     static void SetDelay(long milliseconds);
+        // set the delay after which the tooltip disappears or how long the tooltip remains visible
+    static void SetAutoPop(long milliseconds);
+        // set the delay between subsequent tooltips to appear
+    static void SetReshow(long milliseconds);
 
 private:
     void SetWindow(wxWindow* window);

diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index add64f06bc64081f6755dc44d497f88ff1dcfde8..de97789e55d6df709f4b790015e7b3a6f5e178c0 100644 (file)
--- a/include/wx/gtk/tooltip.h
+++ b/include/wx/gtk/tooltip.h
@@ -33,6 +33,10 @@ public:
     // globally change the tooltip parameters
     static void Enable( bool flag );
     static void SetDelay( long msecs );
+        // set the delay after which the tooltip disappears or how long the tooltip remains visible
+    static void SetAutoPop(long msecs);
+        // set the delay between subsequent tooltips to appear
+    static void SetReshow(long msecs);
 
     // get/set the tooltip text
     void SetTip( const wxString &tip );

diff --git a/include/wx/gtk1/tooltip.h b/include/wx/gtk1/tooltip.h
index 8d03757923fcf2b8201baa6e8b7f49af166316a0..08a9755abc8dcb19cb1cafaa481a2787d445c9d6 100644 (file)
--- a/include/wx/gtk1/tooltip.h
+++ b/include/wx/gtk1/tooltip.h
@@ -31,6 +31,10 @@ public:
     // globally change the tooltip parameters
     static void Enable( bool flag );
     static void SetDelay( long msecs );
+        // set the delay after which the tooltip disappears or how long the tooltip remains visible
+    static void SetAutoPop(long msecs);
+        // set the delay between subsequent tooltips to appear
+    static void SetReshow(long msecs);
 
     wxToolTip( const wxString &tip );
 

diff --git a/include/wx/mac/carbon/tooltip.h b/include/wx/mac/carbon/tooltip.h
index 0599a7b0d54152ebdb0431a530f562db67c313d3..dfe36d72b68b10f994f91fe13753fb1400a419de 100644 (file)
--- a/include/wx/mac/carbon/tooltip.h
+++ b/include/wx/mac/carbon/tooltip.h
@@ -36,6 +36,10 @@ public:
     static void Enable(bool flag);
         // set the delay after which the tooltip appears
     static void SetDelay(long milliseconds);
+        // set the delay after which the tooltip disappears or how long the tooltip remains visible
+    static void SetAutoPop(long milliseconds);
+        // set the delay between subsequent tooltips to appear
+    static void SetReshow(long milliseconds);
     static void NotifyWindowDelete( WXHWND win ) ;
 
     // implementation only from now on

diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
index d3cf88fc24882075d2ddc0e8dd64ba54cbae82c7..d1b6bba8248f0fd530ad4c8b2c78065b90f58d86 100644 (file)
--- a/include/wx/msw/tooltip.h
+++ b/include/wx/msw/tooltip.h
@@ -37,6 +37,10 @@ public:
     static void Enable(bool flag);
         // set the delay after which the tooltip appears
     static void SetDelay(long milliseconds);
+        // set the delay after which the tooltip disappears or how long the tooltip remains visible
+    static void SetAutoPop(long milliseconds);
+        // set the delay between subsequent tooltips to appear
+    static void SetReshow(long milliseconds);
 
     // implementation only from now on
     // -------------------------------

diff --git a/include/wx/os2/tooltip.h b/include/wx/os2/tooltip.h
index 5a85523492773c61dc3de09d0d5ddb1ef436699e..7c4503d537dc095406f7e982d82275d400474ca5 100644 (file)
--- a/include/wx/os2/tooltip.h
+++ b/include/wx/os2/tooltip.h
@@ -33,6 +33,10 @@ public:
     static void Enable(bool WXUNUSED(flag)) {}
         // set the delay after which the tooltip appears
     static void SetDelay(long WXUNUSED(milliseconds)) {}
+        // set the delay after which the tooltip disappears or how long the tooltip remains visible
+    static void SetAutoPop(long WXUNUSED(milliseconds)) {}
+        // set the delay between subsequent tooltips to appear
+    static void SetReshow(long WXUNUSED(milliseconds)) {}
 
     //
     // Implementation

diff --git a/include/wx/palmos/tooltip.h b/include/wx/palmos/tooltip.h
index 3df3d53f10f46a64ebfcb78c30cb26f3f8948209..a7af972c54c99a852b30416a11dae6b50f3ed757 100644 (file)
--- a/include/wx/palmos/tooltip.h
+++ b/include/wx/palmos/tooltip.h
@@ -33,6 +33,10 @@ public:
     static void Enable(bool flag);
         // set the delay after which the tooltip appears
     static void SetDelay(long milliseconds);
+        // set the delay after which the tooltip disappears or how long the tooltip remains visible
+    static void SetAutoPop(long milliseconds);
+        // set the delay between subsequent tooltips to appear
+    static void SetReshow(long milliseconds);
 
     // implementation only from now on
     // -------------------------------

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index a02aedd620a83c10796f72b26b67d30f3a3198cb..08f55c48f4c30e40c03d13fbacf2cb3f71e33d58 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -95,4 +95,12 @@ void wxToolTip::SetDelay( long msecs )
     gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
 }
 
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+
 #endif // wxUSE_TOOLTIPS

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 141f3bc17d53e4508007aedbe18d0c07468d0e11..28d243f78971302bf2ca89d05a6a71c155957626 100644 (file)
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -79,4 +79,12 @@ void wxToolTip::SetDelay( long msecs )
     gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
 }
 
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+
 #endif

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index e4eebd10861713091bc5d76b322a6b9cefbf09f4..18c9ca7adaa5cf8575ddf3d14edbe575d3f61ded 100644 (file)
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -146,6 +146,14 @@ void wxToolTip::SetDelay( long msecs )
     s_ToolTipDelay = msecs ;
 }
 
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+
 void wxToolTip::RelayEvent( wxWindow *win , wxMouseEvent &event )
 {
     if ( s_ShowToolTips )

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 0e41099317b87a21805e171333cbe96adadcd2f2..0b705200f7207df181c69c6f280a7a78b10b5c95 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -191,6 +191,18 @@ void wxToolTip::SetDelay(long milliseconds)
                             TTDT_INITIAL, milliseconds);
 }
 
+void wxToolTip::SetAutoPop(long milliseconds)
+{
+    SendTooltipMessageToAll(ms_hwndTT, TTM_SETDELAYTIME,
+                            TTDT_AUTOPOP, milliseconds);
+}
+
+void wxToolTip::SetReshow(long milliseconds)
+{
+    SendTooltipMessageToAll(ms_hwndTT, TTM_SETDELAYTIME,
+                            TTDT_RESHOW, milliseconds);
+}
+
 // ---------------------------------------------------------------------------
 // implementation helpers
 // ---------------------------------------------------------------------------

diff --git a/src/palmos/tooltip.cpp b/src/palmos/tooltip.cpp
index 6ea34c8838674b39b33f5b42e0bc97a922d76d04..36298c1e80a72ca8d7aca98239981993441b3c11 100644 (file)
--- a/src/palmos/tooltip.cpp
+++ b/src/palmos/tooltip.cpp
@@ -99,6 +99,14 @@ void wxToolTip::SetDelay(long milliseconds)
 {
 }
 
+void wxToolTip::SetAutoPop( long WXUNUSED(milliseconds) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(milliseconds) )
+{
+}
+
 // ---------------------------------------------------------------------------
 // implementation helpers
 // ---------------------------------------------------------------------------