no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index eed23861118164bb799f4e56f20b9d75ddbb7aaf..db205f5f16362975a9d0ed92d9b55b0b562c3895 100644 (file)
--- a/include/wx/gtk/tooltip.h
+++ b/include/wx/gtk/tooltip.h
@@ -3,17 +3,13 @@
 // Purpose:     wxToolTip class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxToolTip class
 // Author:      Robert Roebling
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTOOLTIPH__
 #define __GTKTOOLTIPH__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTOOLTIPH__
 #define __GTKTOOLTIPH__
 

-#ifdef __GNUG__
-    #pragma interface
-#endif
-

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


@@ -22,21 +18,25 @@
 // forward declarations
 //-----------------------------------------------------------------------------
 
 // forward declarations
 //-----------------------------------------------------------------------------
 

-class wxToolTip;
-class wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxToolTip;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 //-----------------------------------------------------------------------------
 // wxToolTip
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxToolTip
 //-----------------------------------------------------------------------------
 

-class wxToolTip : public wxObject
+class WXDLLIMPEXP_CORE wxToolTip : public wxObject

 {
 public:
 {
 public:

+    wxToolTip( const wxString &tip );
+

     // globally change the tooltip parameters
     static void Enable( bool flag );
     static void SetDelay( long msecs );
     // globally change the tooltip parameters
     static void Enable( bool flag );
     static void SetDelay( long msecs );

-
-    wxToolTip( const wxString &tip );
+        // 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 );
 
     // get/set the tooltip text
     void SetTip( const wxString &tip );


@@ -45,12 +45,19 @@ public:
     wxWindow *GetWindow() const { return m_window; }
     bool IsOk() const { return m_window != NULL; }
 
     wxWindow *GetWindow() const { return m_window; }
     bool IsOk() const { return m_window != NULL; }
 

-    // implementation
-    void Apply( wxWindow *win );
+
+    // this forwards back to wxWindow::GTKApplyToolTip()
+    void GTKApply( wxWindow *win );
+
+    // this just sets the given tooltip for the specified widget
+    // tip must be UTF-8 encoded
+    static void GTKApply(GtkWidget *w, const gchar *tip);

 
 private:
     wxString     m_text;
     wxWindow    *m_window;
 
 private:
     wxString     m_text;
     wxWindow    *m_window;

+
+    DECLARE_ABSTRACT_CLASS(wxToolTip)

 };
 
 #endif // __GTKTOOLTIPH__
 };
 
 #endif // __GTKTOOLTIPH__