Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index de97789e55d6df709f4b790015e7b3a6f5e178c0..25c682b428b8303883711a117171477b8014e8c2 100644 (file)
--- a/include/wx/gtk/tooltip.h
+++ b/include/wx/gtk/tooltip.h
@@ -1,16 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tooltip.h
+// Name:        wx/gtk/tooltip.h

 // Purpose:     wxToolTip class
 // Author:      Robert Roebling
 // Purpose:     wxToolTip class
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling
 // 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 +16,6 @@
 // forward declarations
 //-----------------------------------------------------------------------------
 
 // forward declarations
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_FWD_CORE wxToolTip;

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


@@ -43,18 +40,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; }

 
 

-
-    // 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;
 
 private:
     wxString     m_text;


@@ -63,4 +52,4 @@ private:
     DECLARE_ABSTRACT_CLASS(wxToolTip)
 };
 
     DECLARE_ABSTRACT_CLASS(wxToolTip)
 };
 

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