X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e5f6c7c609dd0b478b95df672af4093a7a5b3ac..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/gtk/tooltip.h

diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index c2ed58bfe4..6a01dd6468 100644
--- a/include/wx/gtk/tooltip.h
+++ b/include/wx/gtk/tooltip.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tooltip.h
+// Name:        wx/gtk/tooltip.h
 // Purpose:     wxToolTip class
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,10 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKTOOLTIPH__
-#define __GTKTOOLTIPH__
+#ifndef _WX_GTKTOOLTIP_H_
+#define _WX_GTKTOOLTIP_H_
 
-#include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/object.h"
 
@@ -18,8 +17,7 @@
 // forward declarations
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxToolTip;
-class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 //-----------------------------------------------------------------------------
 // wxToolTip
@@ -33,24 +31,20 @@ public:
     // globally change the tooltip parameters
     static void Enable( bool flag );
     static void SetDelay( long msecs );
+        // set the delay after which the tooltip disappears or how long the tooltip remains visible
+    static void SetAutoPop(long msecs);
+        // set the delay between subsequent tooltips to appear
+    static void SetReshow(long msecs);
 
     // get/set the tooltip text
     void SetTip( const wxString &tip );
     wxString GetTip() const { return m_text; }
 
     wxWindow *GetWindow() const { return m_window; }
-    bool IsOk() const { return m_window != NULL; }
 
-
-    // wxGTK-only from now on
-
-    // this forwards back to wxWindow::ApplyToolTip()
-    void Apply( wxWindow *win );
-
-    // this just sets the given tooltip for the specified widget
-    //
-    // tip must be already UTF-8 encoded
-    static void Apply(GtkWidget *w, const gchar *tip);
+    // Implementation
+    void GTKSetWindow(wxWindow* win);
+    static void GTKApply(GtkWidget* widget, const char* tip);
 
 private:
     wxString     m_text;
@@ -59,4 +53,4 @@ private:
     DECLARE_ABSTRACT_CLASS(wxToolTip)
 };
 
-#endif // __GTKTOOLTIPH__
+#endif // _WX_GTKTOOLTIP_H_