rename Inside(x,y) parameters to avoid gcc warnings about parameters shadowing member...

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

diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index d92f206e82da804b9eab816b18785def6211f710..ad476e5ecb1419ee468a43dc77737cde1a3e6572 100644 (file)
--- a/include/wx/gtk/tooltip.h
+++ b/include/wx/gtk/tooltip.h
@@ -10,10 +10,6 @@
 #ifndef __GTKTOOLTIPH__
 #define __GTKTOOLTIPH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/object.h"
@@ -32,12 +28,12 @@ class WXDLLIMPEXP_CORE wxWindow;
 class WXDLLIMPEXP_CORE wxToolTip : public wxObject
 {
 public:
+    wxToolTip( const wxString &tip );
+
     // globally change the tooltip parameters
     static void Enable( bool flag );
     static void SetDelay( long msecs );
 
-    wxToolTip( const wxString &tip );
-
     // get/set the tooltip text
     void SetTip( const wxString &tip );
     wxString GetTip() const { return m_text; }
@@ -45,9 +41,17 @@ public:
     wxWindow *GetWindow() const { return m_window; }
     bool IsOk() const { return m_window != NULL; }
 
-    // implementation
+
+    // 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 wxCharBuffer& tip);
+
 private:
     wxString     m_text;
     wxWindow    *m_window;