X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..da8b1d4b3b535aba94d04494f5b6e2b3e47901ee:/include/wx/msw/tooltip.h?ds=sidebyside

diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
index d8fb5c35e5..c720ae3dc2 100644
--- a/include/wx/msw/tooltip.h
+++ b/include/wx/msw/tooltip.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/tooltip.h
+// Name:        wx/msw/tooltip.h
 // Purpose:     wxToolTip class - tooltip control
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -9,13 +9,26 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-class WXDLLEXPORT wxToolTip : public wxObject
+#ifndef _WX_MSW_TOOLTIP_H_
+#define _WX_MSW_TOOLTIP_H_
+
+#include "wx/object.h"
+#include "wx/gdicmn.h"
+
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+
+class WXDLLIMPEXP_CORE wxToolTip : public wxObject
 {
 public:
     // ctor & dtor
     wxToolTip(const wxString &tip);
     virtual ~wxToolTip();
 
+    // ctor used by wxStatusBar to associate a tooltip to a portion of
+    // the status bar window:
+    wxToolTip(wxWindow* win, unsigned int id,
+              const wxString &tip, const wxRect& rc);
+
     // accessors
         // tip text
     void SetTip(const wxString& tip);
@@ -30,12 +43,30 @@ 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);
+        // set maximum width for the new tooltips: -1 disables wrapping
+        // entirely, 0 restores the default behaviour
+    static void SetMaxWidth(int width);
 
     // implementation only from now on
     // -------------------------------
 
-    // should be called in responde to WM_MOUSEMOVE
-    void RelayEvent(WXMSG *msg);
+    // should be called in response to WM_MOUSEMOVE
+    static void RelayEvent(WXMSG *msg);
+
+    // add a window to the tooltip control
+    void Add(WXHWND hwnd);
+
+    // remove any tooltip from the window
+    static void Remove(WXHWND hwnd, unsigned int id, const wxRect& rc);
+
+    // the rect we're associated with
+    void SetRect(const wxRect& rc);
+    const wxRect& GetRect() const { return m_rect; }
 
 private:
     // the one and only one tooltip control we use - never access it directly
@@ -45,16 +76,20 @@ private:
     // create the tooltip ctrl if it doesn't exist yet and return its HWND
     static WXHWND GetToolTipCtrl();
 
+    // new tooltip maximum width, defaults to min(display width, 400)
+    static int ms_maxWidth;
+
     // remove this tooltip from the tooltip control
     void Remove();
 
-    // add a window to the tooltip control
-    void Add(WXHWND hwnd);
-
     wxString  m_text;           // tooltip text
-    wxWindow *m_window;         // window we're associated with
+    wxWindow* m_window;         // window we're associated with
+    wxRect    m_rect;           // the rect of the window for which this tooltip is shown
+                                // (or a rect with width/height == 0 to show it for the entire window)
+    unsigned int m_id;          // the id of this tooltip (ignored when m_rect width/height is 0)
 
     DECLARE_ABSTRACT_CLASS(wxToolTip)
-    DECLARE_NO_COPY_CLASS(wxToolTip)
+    wxDECLARE_NO_COPY_CLASS(wxToolTip);
 };
 
+#endif // _WX_MSW_TOOLTIP_H_