Make wxRect parameter of wxRichToolTip::ShowFor() const.

[wxWidgets.git] / include / wx / generic / private / richtooltip.h

diff --git a/include/wx/generic/private/richtooltip.h b/include/wx/generic/private/richtooltip.h
index 3730638592904b25a69926eb6d6b2fadb01d771a..74db33530378fd2fef06e5a44f9d0e987e528815 100644 (file)
--- a/include/wx/generic/private/richtooltip.h
+++ b/include/wx/generic/private/richtooltip.h
@@ -3,13 +3,13 @@
 // Purpose:     wxRichToolTipGenericImpl declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-18
 // Purpose:     wxRichToolTipGenericImpl declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-18

-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_

-#define _GENERIC_PRIVATE_RICHTOOLTIP_H_
+#define _WX_GENERIC_PRIVATE_RICHTOOLTIP_H_

 
 #include "wx/icon.h"
 #include "wx/colour.h"
 
 #include "wx/icon.h"
 #include "wx/colour.h"


@@ -30,17 +30,19 @@ public:
         // This is pretty arbitrary, we could follow MSW and use some multiple
         // of double-click time here.
         m_timeout = 5000;
         // This is pretty arbitrary, we could follow MSW and use some multiple
         // of double-click time here.
         m_timeout = 5000;

+        m_delay = 0;

     }
 
     virtual void SetBackgroundColour(const wxColour& col,
                                      const wxColour& colEnd);
     virtual void SetCustomIcon(const wxIcon& icon);
     virtual void SetStandardIcon(int icon);
     }
 
     virtual void SetBackgroundColour(const wxColour& col,
                                      const wxColour& colEnd);
     virtual void SetCustomIcon(const wxIcon& icon);
     virtual void SetStandardIcon(int icon);

-    virtual void SetTimeout(unsigned milliseconds);
+    virtual void SetTimeout(unsigned milliseconds,
+                            unsigned millisecondsDelay = 0);

     virtual void SetTipKind(wxTipKind tipKind);
     virtual void SetTitleFont(const wxFont& font);
 
     virtual void SetTipKind(wxTipKind tipKind);
     virtual void SetTitleFont(const wxFont& font);
 

-    virtual void ShowFor(wxWindow* win);
+    virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL);

 
 protected:
     wxString m_title,
 
 protected:
     wxString m_title,


@@ -52,7 +54,8 @@ private:
     wxColour m_colStart,
              m_colEnd;
 
     wxColour m_colStart,
              m_colEnd;
 

-    unsigned m_timeout;
+    unsigned m_timeout,
+             m_delay;

 
     wxTipKind m_tipKind;
 
 
     wxTipKind m_tipKind;