Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/tooltip.h b/include/wx/os2/tooltip.h
index 493225f84fd9985d990400fe1542f66e81f71abf..87368c486128ac783100c8a348f457335df7d801 100644 (file)
--- a/include/wx/os2/tooltip.h
+++ b/include/wx/os2/tooltip.h
@@ -1,49 +1,55 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/tooltip.h
+// Name:        wx/os2/tooltip.h

 // Purpose:     wxToolTip class - tooltip control
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxToolTip class - tooltip control
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_OS2_TOOLTIP_H_
+#define _WX_OS2_TOOLTIP_H_
+

 class wxToolTip : public wxObject
 {
 public:
     // ctor & dtor
 class wxToolTip : public wxObject
 {
 public:
     // ctor & dtor

-    wxToolTip(const wxString &tip);
+    wxToolTip(const wxString &rsTip);

     virtual ~wxToolTip();
 
     virtual ~wxToolTip();
 

-    // accessors
-        // tip text
-    void SetTip(const wxString& tip);
-    const wxString& GetTip() const { return m_text; }
+    //
+    // Accessors
+    //
+    inline const wxString& GetTip(void) const { return m_sText; }
+    inline wxWindow*       GetWindow(void) const { return m_pWindow; }

 
 

-        // the window we're associated with
-    void SetWindow(wxWindow *win);
-    wxWindow *GetWindow() const { return m_window; }
+           void            SetTip(const wxString& rsTip);
+    inline void            SetWindow(wxWindow* pWin) { m_pWindow = pWin; }

 
     // controlling tooltip behaviour: globally change tooltip parameters
         // enable or disable the tooltips globally
 
     // controlling tooltip behaviour: globally change tooltip parameters
         // enable or disable the tooltips globally

-    static void Enable(bool flag);
+    static void Enable(bool WXUNUSED(flag)) {}

         // set the delay after which the tooltip appears
         // set the delay after which the tooltip appears

-    static void SetDelay(long milliseconds);
-
-    // implementation
-    void RelayEvent(WXMSG *msg);
+    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
+    //
+    void DisplayToolTipWindow(const wxPoint& rPos);
+    void HideToolTipWindow(void);

 
 private:
 
 private:

-    static WXHWND hwndTT;
-    // create the tooltip ctrl for our parent frame if it doesn't exist yet
-    // and return its window handle
-    WXHWND GetToolTipCtrl();
-
-    // remove this tooltip from the tooltip control
-    void Remove();
+    void Create(const wxString &rsTip);

 
 

-    wxString  m_text;           // tooltip text
-    wxWindow *m_window;         // window we're associated with
-};
+    HWND                            m_hWnd;
+    wxString                        m_sText;           // tooltip text
+    wxWindow*                       m_pWindow;         // window we're associated with
+}; // end of CLASS wxToolTip

 
 

+#endif // _WX_OS2_TOOLTIP_H_