Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/cocoa/tooltip.h b/include/wx/cocoa/tooltip.h
index 403445363b3e6c453d5f5c37f14d78a2e61e760f..ee632c6873d7bba95445437f46727166877beae4 100644 (file)
--- a/include/wx/cocoa/tooltip.h
+++ b/include/wx/cocoa/tooltip.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/tooltip.h
+// Name:        wx/cocoa/tooltip.h

 // Purpose:     wxToolTip class - tooltip control
 // Author:      Ryan Norton
 // Modified by:
 // Purpose:     wxToolTip class - tooltip control
 // Author:      Ryan Norton
 // Modified by:


@@ -9,35 +9,47 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_COCOA_TOOLTIP_H_
+#define _WX_COCOA_TOOLTIP_H_
+

 #include "wx/object.h"
 
 #include "wx/object.h"
 

+class wxWindow;
+

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

-    wxToolTip(const wxString &tip) : m_text(tip), m_window(0) {}
-    virtual ~wxToolTip() {}
+    wxToolTip(const wxString &tip);
+    virtual ~wxToolTip();

 
     // accessors
         // tip text
 
     // accessors
         // tip text

-    void SetTip(const wxString& tip)   { m_text = tip; }
-    const wxString& GetTip() const { return m_text; }
+    void SetTip(const wxString& tip);
+    const wxString& GetTip() const;

 
         // the window we're associated with
 
         // the window we're associated with

-    wxWindow *GetWindow() const { return m_window; }
+    wxWindow *GetWindow() const;

 
     // 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 flag);

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

-    static void SetDelay(long milliseconds) {}
+    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:
 
 private:

-    void SetWindow(wxWindow* window) {m_window = window;}
+    void SetWindow(wxWindow* window);
+

     friend class wxWindow;
 
     wxString  m_text;           // tooltip text
     wxWindow *m_window;         // window we're associated with
     friend class wxWindow;
 
     wxString  m_text;           // tooltip text
     wxWindow *m_window;         // window we're associated with

-    
+

     DECLARE_ABSTRACT_CLASS(wxToolTip)
     DECLARE_ABSTRACT_CLASS(wxToolTip)

-};
\ No newline at end of file
+};
+
+#endif // _WX_COCOA_TOOLTIP_H_