Fix wrong return value in the changes of r73365.

[wxWidgets.git] / include / wx / msw / tooltip.h

diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
index 7575d5f3b02053e9b16361a3d27ac148b6ef1610..ae512d928b092f867b2efaa89e963b959f8034b7 100644 (file)
--- a/include/wx/msw/tooltip.h
+++ b/include/wx/msw/tooltip.h
@@ -13,8 +13,10 @@
 #define _WX_MSW_TOOLTIP_H_
 
 #include "wx/object.h"
+#include "wx/gdicmn.h"
 
 class WXDLLIMPEXP_FWD_CORE wxWindow;
+class wxToolTipOtherWindows;
 
 class WXDLLIMPEXP_CORE wxToolTip : public wxObject
 {
@@ -23,6 +25,11 @@ public:
     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);
@@ -49,16 +56,32 @@ public:
     // implementation only from now on
     // -------------------------------
 
-    // should be called in responde to WM_MOUSEMOVE
+    // should be called in response to WM_MOUSEMOVE
     static void RelayEvent(WXMSG *msg);
 
     // add a window to the tooltip control
-    void Add(WXHWND hwnd);
+    void AddOtherWindow(WXHWND hwnd);
 
     // remove any tooltip from the window
-    static void Remove(WXHWND hwnd);
+    static void Remove(WXHWND hwnd, unsigned int id, const wxRect& rc);
+
+    // Set the rectangle we're associated with. This rectangle is only used for
+    // the main window, not any sub-windows added with Add() so in general it
+    // makes sense to use it for tooltips associated with a single window only.
+    void SetRect(const wxRect& rc);
 
 private:
+    // Adds a window other than our main m_window to this tooltip.
+    void DoAddHWND(WXHWND hWnd);
+
+    // Perform the specified operation for the given window only.
+    void DoSetTip(WXHWND hWnd);
+    void DoRemove(WXHWND hWnd);
+
+    // Call the given function for all windows we're associated with.
+    void DoForAllWindows(void (wxToolTip::*func)(WXHWND));
+
+
     // the one and only one tooltip control we use - never access it directly
     // but use GetToolTipCtrl() which will create it when needed
     static WXHWND ms_hwndTT;
@@ -73,7 +96,11 @@ private:
     void Remove();
 
     wxString  m_text;           // tooltip text
-    wxWindow *m_window;         // window we're associated with
+    wxWindow* m_window;         // main window we're associated with
+    wxToolTipOtherWindows *m_others; // other windows associated with it or NULL
+    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)
     wxDECLARE_NO_COPY_CLASS(wxToolTip);