Ensure that the progress dialog parent is activated at the end under MSW.

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

diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index db205f5f16362975a9d0ed92d9b55b0b562c3895..6a01dd6468e08356de8b755bd4929717ce9cce09 100644 (file)
--- 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$
 // Purpose:     wxToolTip class
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,10 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 #include "wx/string.h"
 #include "wx/object.h"
 


@@ -18,7 +17,6 @@
 // forward declarations
 //-----------------------------------------------------------------------------
 
 // forward declarations
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_FWD_CORE wxToolTip;

 class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 //-----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 //-----------------------------------------------------------------------------


@@ -43,15 +41,10 @@ public:
     wxString GetTip() const { return m_text; }
 
     wxWindow *GetWindow() const { return m_window; }
     wxString GetTip() const { return m_text; }
 
     wxWindow *GetWindow() const { return m_window; }

-    bool IsOk() const { return m_window != NULL; }

 
 

-
-    // 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);
+    // Implementation
+    void GTKSetWindow(wxWindow* win);
+    static void GTKApply(GtkWidget* widget, const char* tip);

 
 private:
     wxString     m_text;
 
 private:
     wxString     m_text;


@@ -60,4 +53,4 @@ private:
     DECLARE_ABSTRACT_CLASS(wxToolTip)
 };
 
     DECLARE_ABSTRACT_CLASS(wxToolTip)
 };
 

-#endif // __GTKTOOLTIPH__
+#endif // _WX_GTKTOOLTIP_H_